diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java index 80d1e640ef794f..26418dd4e809af 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java @@ -280,23 +280,27 @@ public Multimap getNormalReplicaBackendPathMap() { return map; } + // When a BE reports a missing version, lastFailedVersion is set. When a write fails on a replica, + // lastFailedVersion is set. // for query public List getQueryableReplicas(long visibleVersion, Map> backendAlivePathHashs, - boolean allowFailedVersion) { + boolean allowMissingVersion) { List allQueryableReplica = Lists.newArrayListWithCapacity(replicas.size()); List auxiliaryReplica = Lists.newArrayListWithCapacity(replicas.size()); List deadPathReplica = Lists.newArrayList(); + List mayMissingVersionReplica = Lists.newArrayList(); + List notCatchupReplica = Lists.newArrayList(); + for (Replica replica : replicas) { if (replica.isBad()) { continue; } - - // Skip the missing version replica - if (replica.getLastFailedVersion() > 0 && !allowFailedVersion) { + if (!replica.checkVersionCatchUp(visibleVersion, false)) { + notCatchupReplica.add(replica); continue; } - - if (!replica.checkVersionCatchUp(visibleVersion, false)) { + if (replica.getLastFailedVersion() > 0) { + mayMissingVersionReplica.add(replica); continue; } @@ -322,6 +326,15 @@ public List getQueryableReplicas(long visibleVersion, Map 1) { long minVersionCount = allQueryableReplica.stream().mapToLong(Replica::getVisibleVersionCount) .filter(count -> count != -1).min().orElse(Long.MAX_VALUE);