Skip to content

branch-3.1: [enhancement](cloud) Fix cloud restore from doris version 2.1 to 3.1 #55110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 2 commits into from
Sep 4, 2025
Merged

branch-3.1: [enhancement](cloud) Fix cloud restore from doris version 2.1 to 3.1 #55110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c5c4bf
save
xy720 Aug 21, 2025
e8d09fb
Merge branch 'branch-3.1' into fix-restore-from-21
xy720 Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.doris.cloud.catalog.CloudPartition;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.io.Text;
import org.apache.doris.rpc.RpcException;

Expand Down Expand Up @@ -350,6 +351,14 @@ public boolean visualiseShadowIndex(long shadowIndexId, boolean isBaseIndex) {

@Deprecated
public static Partition read(DataInput in) throws IOException {
if (Env.getCurrentEnvJournalVersion() <= FeMetaVersion.VERSION_129) {
// For meta <= 2.1, we should not call EnvFactory.getInstance().createPartition(), because
// it will create a new CloudPartition in cloud mode, which is not expected in meta <= 2.1.
// This case happens when we restore old doris <= 2.1 to a new cloud doris.
Partition partition = new Partition();
partition.readFields(in);
return partition;
}
Partition partition = EnvFactory.getInstance().createPartition();
partition.readFields(in);
return partition;
Expand Down
18 changes: 11 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,13 +466,17 @@ public void readFields(DataInput in) throws IOException {
}

idToInMemory.put(partitionId, in.readBoolean());
if (Config.isCloudMode()) {
// HACK: the origin implementation of the cloud mode has code likes:
//
// idToPersistent.put(partitionId, in.readBoolean());
//
// keep the compatibility here.
in.readBoolean();
// For meta <= 2.1, we don't need to do this. Or else if we backup from old doris <= 2.1
// and restore to a new cloud doris, it will fail at read BackupMeta.
if (Env.getCurrentEnvJournalVersion() > FeMetaVersion.VERSION_129) {
if (Config.isCloudMode()) {
// HACK: the origin implementation of the cloud mode has code likes:
//
// idToPersistent.put(partitionId, in.readBoolean());
//
// keep the compatibility here.
in.readBoolean();
}
}
}
if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_125) {
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_duplicate_validate_restore.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ suite("test_duplicate_validate_restore", "validate_restore") {
}

runDuplicateValidateRestore("3.0")
//runDuplicateValidateRestore("2.1")
runDuplicateValidateRestore("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ suite("test_validate_validate_restore", "validate_restore") {
}

runValidateRestore("3.0")
//runValidateRestore("2.1")
runValidateRestore("2.1")
}
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_alias.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ suite("test_validate_restore_alias", "validate_restore") {
}

runValidateRestoreAlias("3.0")
//runValidateRestoreAlias("2.1")
runValidateRestoreAlias("2.1")
}
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_backup_temp_partition.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ suite("test_validate_restore_backup_temp_partition", "validate_restore") {
}

runValidateRestoreBackupTempPartition("3.0")
//runValidateRestoreBackupTempPartition("2.1")
runValidateRestoreBackupTempPartition("2.1")
}
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_bloom_filter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ suite("test_validate_restore_bloom_filter", "validate_restore") {
}

runValidateRestoreBloomFilter("3.0")
//runValidateRestoreBloomFilter("2.1")
runValidateRestoreBloomFilter("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_db.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ suite("test_validate_restore_db", "validate_restore") {
}

runValidateRestoreDb("3.0")
//runValidateRestoreDb("2.1")
runValidateRestoreDb("2.1")
}
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_diff_repo_same_snapshot.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ suite("test_validate_restore_diff_repo_same_snapshot", "validate_restore") {
}

runValidateRestoreDiffRepoSameSnapshot("3.0")
//runValidateRestoreDiffRepoSameSnapshot("2.1")
runValidateRestoreDiffRepoSameSnapshot("2.1")
}
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_dup_without_default_keys.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ suite("test_validate_restore_dup_without_default_keys", "validate_restore") {
}

runValidateRestoreDupWithoutDefaultKeys("3.0")
//runValidateRestoreDupWithoutDefaultKeys("2.1")
runValidateRestoreDupWithoutDefaultKeys("2.1")
}

2 changes: 1 addition & 1 deletion ...ession-test/suites/restore_p0/test_validate_restore_dynamic_partition_reserve_true.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ suite("test_validate_restore_dynamic_partition_reserve_true", "validate_restore"
}

runValidateRestoreDynamicPartitionReserveTrue("3.0")
//runValidateRestoreDynamicPartitionReserveTrue("2.1")
runValidateRestoreDynamicPartitionReserveTrue("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_exclude.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ suite("test_validate_restore_exclude", "validate_restore") {
}

runValidateRestoreExclude("3.0")
//runValidateRestoreExclude("2.1")
runValidateRestoreExclude("2.1")
}


2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_inverted_idx.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ suite("test_validate_restore_inverted_idx", "validate_restore") {
}

runValidateRestoreInvertedIdx("3.0")
//runValidateRestoreInvertedIdx("2.1")
runValidateRestoreInvertedIdx("2.1")
}


2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_inverted_index.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ suite("test_validate_restore_inverted_index", "validate_restore") {
}

runValidateRestoreInvertedIndex("3.0")
//runValidateRestoreInvertedIndex("2.1")
runValidateRestoreInvertedIndex("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_mix_exists_and_new_table.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ suite("test_validate_restore_mix_exists_and_new_table", "validate_restore") {
}

runValidateRestoreMixExistsAndNewTable("3.0")
//runValidateRestoreMixExistsAndNewTable("2.1")
runValidateRestoreMixExistsAndNewTable("2.1")
}


2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_mtmv.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ suite("test_validate_restore_mtmv", "validate_restore") {
}

runValidateRestoreMtmv("3.0")
//runValidateRestoreMtmv("2.1")
runValidateRestoreMtmv("2.1")
}


2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_mv.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ suite("test_validate_restore_mv", "validate_restore") {
}

runValidateRestoreMv("3.0")
//runValidateRestoreMv("2.1")
runValidateRestoreMv("2.1")
}


2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_ngram_bloom_filter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,6 @@ suite("test_validate_restore_ngram_bloom_filter", "validate_restore") {
}

runValidateRestoreNgramBloomFilter("3.0")
//runValidateRestoreNgramBloomFilter("2.1")
runValidateRestoreNgramBloomFilter("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_partition.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ suite("test_validate_restore_partition", "validate_restore") {
}

runValidateRestorePartition("3.0")
//runValidateRestorePartition("2.1")
runValidateRestorePartition("2.1")
}

2 changes: 1 addition & 1 deletion ...ssion-test/suites/restore_p0/test_validate_restore_reserve_dynamic_partition_false.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ suite("test_validate_restore_reserve_dynamic_partition_false", "validate_restore
}

runValidateRestoreReserveDynamicPartitionFalse("3.0")
//runValidateRestoreReserveDynamicPartitionFalse("2.1")
runValidateRestoreReserveDynamicPartitionFalse("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_table_auto_bucket.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ suite("test_validate_restore_table_auto_bucket", "validate_restore") {
}

runValidateRestoreTableAutoBucket("3.0")
//runValidateRestoreTableAutoBucket("2.1")
runValidateRestoreTableAutoBucket("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_to_new_table.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ suite("test_validate_restore_to_new_table", "validate_restore") {
}

runValidateRestoreToNewTable("3.0")
//runValidateRestoreToNewTable("2.1")
runValidateRestoreToNewTable("2.1")
}
2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_with_two_phase_fetch_opt.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ suite("test_validate_restore_with_two_phase_fetch_opt", "validate_restore") {
}

runValidateRestoreWithTwoPhaseFetchOpt("3.0")
//runValidateRestoreWithTwoPhaseFetchOpt("2.1")
runValidateRestoreWithTwoPhaseFetchOpt("2.1")
}

2 changes: 1 addition & 1 deletion regression-test/suites/restore_p0/test_validate_restore_with_view.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,5 @@ suite("test_validate_restore_with_view", "validate_restore") {
}

runValidateRestoreWithView("3.0")
//runValidateRestoreWithView("2.1")
runValidateRestoreWithView("2.1")
}