fix backup and restore failed between force_replication_allocation se…

…tted and not setted clusters (apache#34624)
mongo360 · May 20, 2024 · 0140b47 · 0140b47
1 parent 713618d
commit 0140b47
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RestoreStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RestoreStmt.java
@@ -20,6 +20,7 @@
 import org.apache.doris.backup.Repository;
 import org.apache.doris.catalog.ReplicaAllocation;
 import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
 import org.apache.doris.common.ErrorCode;
 import org.apache.doris.common.ErrorReport;
 import org.apache.doris.common.UserException;
@@ -164,6 +165,10 @@ public void analyzeProperties() throws AnalysisException {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_COMMON_ERROR,
                         "Invalid reserve_replica value: " + copiedProperties.get(PROP_RESERVE_REPLICA));
             }
+            // force set reserveReplica to false, do not keep the origin allocation
+            if (reserveReplica && !Config.force_olap_table_replication_allocation.isEmpty()) {
+                reserveReplica = false;
+            }
             copiedProperties.remove(PROP_RESERVE_REPLICA);
         }
         // reserve dynamic partition enable

diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java
@@ -32,6 +32,7 @@
 import org.apache.doris.catalog.TableIf.TableType;
 import org.apache.doris.catalog.Tablet;
 import org.apache.doris.catalog.View;
+import org.apache.doris.common.Config;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.common.Version;
 import org.apache.doris.common.io.Text;
@@ -99,6 +100,8 @@ public class BackupJobInfo implements Writable {
     public int minorVersion;
     @SerializedName("patch_version")
     public int patchVersion;
+    @SerializedName("is_force_replication_allocation")
+    public boolean isForceReplicationAllocation;
 
     @SerializedName("tablet_be_map")
     public Map<Long, Long> tabletBeMap = Maps.newHashMap();
@@ -597,6 +600,7 @@ public static BackupJobInfo fromCatalog(long backupTime, String label, String db
         jobInfo.majorVersion = Version.DORIS_BUILD_VERSION_MAJOR;
         jobInfo.minorVersion = Version.DORIS_BUILD_VERSION_MINOR;
         jobInfo.patchVersion = Version.DORIS_BUILD_VERSION_PATCH;
+        jobInfo.isForceReplicationAllocation = !Config.force_olap_table_replication_allocation.isEmpty();
         jobInfo.tableCommitSeqMap = tableCommitSeqMap;
 
         Collection<Table> tbls = backupMeta.getTables().values();

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
@@ -189,6 +189,10 @@ public RestoreJob(String label, String backupTs, long dbId, String dbName, Backu
         this.state = RestoreJobState.PENDING;
         this.metaVersion = metaVersion;
         this.reserveReplica = reserveReplica;
+        // if backup snapshot is come from a cluster with force replication allocation, ignore the origin allocation
+        if (jobInfo.isForceReplicationAllocation) {
+            this.reserveReplica = false;
+        }
         this.reserveDynamicPartitionEnable = reserveDynamicPartitionEnable;
         this.isBeingSynced = isBeingSynced;
         properties.put(PROP_RESERVE_REPLICA, String.valueOf(reserveReplica));