From d374b6e1e4deeafb831823a92581d8ad1a87f6b2 Mon Sep 17 00:00:00 2001
From: Yongqiang YANG <yangyongqiang@selectdb.com>
Date: Thu, 3 Jul 2025 08:32:06 +0800
Subject: [PATCH] [fix](replica) skip missing version should care catchup
 (#49999) (#50094) (#52386)

pick  (#49999) (#50094)
---
 .../java/org/apache/doris/catalog/Tablet.java | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

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 80d1e640ef..26418dd4e8 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 class Tablet extends MetaObject implements Writable {
         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<Replica> getQueryableReplicas(long visibleVersion, Map<Long, Set<Long>> backendAlivePathHashs,
-            boolean allowFailedVersion) {
+            boolean allowMissingVersion) {
         List<Replica> allQueryableReplica = Lists.newArrayListWithCapacity(replicas.size());
         List<Replica> auxiliaryReplica = Lists.newArrayListWithCapacity(replicas.size());
         List<Replica> deadPathReplica = Lists.newArrayList();
+        List<Replica> mayMissingVersionReplica = Lists.newArrayList();
+        List<Replica> 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 class Tablet extends MetaObject implements Writable {
             allQueryableReplica = deadPathReplica;
         }
 
+        if (allQueryableReplica.isEmpty()) {
+            // If be misses a version, be would report failure.
+            allQueryableReplica = mayMissingVersionReplica;
+        }
+
+        if (allQueryableReplica.isEmpty() && allowMissingVersion) {
+            allQueryableReplica = notCatchupReplica;
+        }
+
         if (Config.skip_compaction_slower_replica && allQueryableReplica.size() > 1) {
             long minVersionCount = allQueryableReplica.stream().mapToLong(Replica::getVisibleVersionCount)
                     .filter(count -> count != -1).min().orElse(Long.MAX_VALUE);