[fix](restore) Reset next version for remote table when restore #40118 (

#40166) cherry pick from #40118 Co-authored-by: smallx <[email protected]>
apache · Aug 30, 2024 · 03d9296 · 03d9296
1 parent 18bde27
commit 03d9296
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
@@ -728,6 +728,9 @@ private void checkAndPrepareMeta() {
                         return;
                     }
 
+                    // reset next version to visible version + 1 for all partitions
+                    remoteOlapTbl.resetVersionForRestore();
+
                     // Reset properties to correct values.
                     remoteOlapTbl.resetPropertiesForRestore(reserveDynamicPartitionEnable, reserveReplica,
                                                             replicaAlloc, isBeingSynced);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -549,6 +549,12 @@ public void resetPropertiesForRestore(boolean reserveDynamicPartitionEnable, boo
         setColocateGroup(null);
     }
 
+    public void resetVersionForRestore() {
+        for (Partition partition : idToPartition.values()) {
+            partition.setNextVersion(partition.getVisibleVersion() + 1);
+        }
+    }
+
     public Status resetIdsForRestore(Env env, Database db, ReplicaAllocation restoreReplicaAlloc,
             boolean reserveReplica, String srcDbName) {
         // ATTN: The meta of the restore may come from different clusters, so the