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 index 12a30a97277995..44ccdd44f74c4b 100644 --- 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 @@ -1812,7 +1812,7 @@ private Status allTabletCommitted(boolean isReplay) { // set all restored partition version and version hash // set all tables' state to NORMAL - setTableStateToNormal(db, true, isReplay); + setTableStateToNormalAndUpdateProperties(db, true, isReplay); for (long tblId : restoredVersionInfo.rowKeySet()) { Table tbl = db.getTableNullable(tblId); if (tbl == null) { @@ -2055,7 +2055,7 @@ public void cancelInternal(boolean isReplay) { Database db = env.getInternalCatalog().getDbNullable(dbId); if (db != null) { // rollback table's state to NORMAL - setTableStateToNormal(db, false, isReplay); + setTableStateToNormalAndUpdateProperties(db, false, isReplay); // remove restored tbls for (Table restoreTbl : restoredTbls) { @@ -2135,7 +2135,7 @@ public void cancelInternal(boolean isReplay) { LOG.info("finished to cancel restore job. is replay: {}. {}", isReplay, this); } - private void setTableStateToNormal(Database db, boolean committed, boolean isReplay) { + private void setTableStateToNormalAndUpdateProperties(Database db, boolean committed, boolean isReplay) { for (String tableName : jobInfo.backupOlapTableObjects.keySet()) { Table tbl = db.getTableNullable(jobInfo.getAliasByOriginNameIfSet(tableName)); if (tbl == null) { @@ -2178,6 +2178,9 @@ private void setTableStateToNormal(Database db, boolean committed, boolean isRep DynamicPartitionScheduler.LAST_UPDATE_TIME, TimeUtils.getCurrentFormatTime()); } } + if (committed && isBeingSynced) { + olapTbl.setBeingSyncedProperties(); + } } finally { tbl.writeUnlock(); } 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 index 533c24daa0e7bc..4bc05aff20612e 100644 --- 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 @@ -737,17 +737,26 @@ public void resetPropertiesForRestore(boolean reserveDynamicPartitionEnable, boo tableProperty.resetPropertiesForRestore(reserveDynamicPartitionEnable, reserveReplica, replicaAlloc); } if (isBeingSynced) { - TableProperty tableProperty = getOrCreatTableProperty(); - tableProperty.setIsBeingSynced(); - tableProperty.removeInvalidProperties(); - if (isAutoBucket()) { - markAutoBucket(); - } + setBeingSyncedProperties(); } // remove colocate property. setColocateGroup(null); } + /** + * Set the related properties when is_being_synced properties is true. + * + * Some properties, like storage_policy, colocate_with, are not supported by the ccr syncer. + */ + public void setBeingSyncedProperties() { + TableProperty tableProperty = getOrCreatTableProperty(); + tableProperty.setIsBeingSynced(); + tableProperty.removeInvalidProperties(); + if (isAutoBucket()) { + markAutoBucket(); + } + } + public void resetVersionForRestore() { for (Partition partition : idToPartition.values()) { partition.setNextVersion(partition.getVisibleVersion() + 1);