This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new fdc8b454d2a [chore](backup) Remove delete_if_exists properties for
creating repository (#38192)
fdc8b454d2a is described below
commit fdc8b454d2a332a4eb970c05699289d8bf377b80
Author: walter <[email protected]>
AuthorDate: Tue Jul 23 11:09:02 2024 +0800
[chore](backup) Remove delete_if_exists properties for creating repository
(#38192)
delete_if_exists is a temporary solution introduced in #25847, to avoid
concurrent testing conflicts.
Cherry-pick #38190
---
.../apache/doris/analysis/CreateRepositoryStmt.java | 12 ------------
.../java/org/apache/doris/backup/Repository.java | 21 ---------------------
.../org/apache/doris/regression/suite/Syncer.groovy | 3 +--
.../backup_restore/test_backup_restore.groovy | 2 +-
.../backup_restore/test_backup_restore_alias.groovy | 2 +-
...test_backup_restore_backup_temp_partition.groovy | 2 +-
.../test_backup_restore_bloom_filter.groovy | 2 +-
.../backup_restore/test_backup_restore_db.groovy | 2 +-
...st_backup_restore_diff_repo_same_snapshot.groovy | 2 +-
...t_backup_restore_dup_without_default_keys.groovy | 2 +-
.../test_backup_restore_exclude.groovy | 2 +-
.../test_backup_restore_inverted_index.groovy | 2 +-
.../backup_restore/test_backup_restore_mtmv.groovy | 2 +-
.../test_backup_restore_multi_tables.groovy | 2 +-
...est_backup_restore_multi_tables_overwrite.groovy | 2 +-
.../test_backup_restore_ngram_bloom_filter.groovy | 2 +-
.../test_backup_restore_overwrite_indexes.groovy | 2 +-
.../test_backup_restore_partition.groovy | 2 +-
...p_restore_reserve_dynamic_partition_false.groovy | 2 +-
...up_restore_reserve_dynamic_partition_true.groovy | 2 +-
.../test_backup_restore_table_auto_bucket.groovy | 2 +-
.../backup_restore/test_backup_restore_with.groovy | 2 +-
.../test_backup_restore_with_hdfs.groovy | 2 +-
...t_backup_restore_with_two_phase_fetch_opt.groovy | 2 +-
.../test_duplicate_backup_restore.groovy | 4 ++--
.../test_restore_mix_exists_and_new_table.groovy | 2 +-
.../backup_restore/test_restore_to_new_table.groovy | 2 +-
.../test_unique_backup_restore.groovy | 4 ++--
28 files changed, 28 insertions(+), 62 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
index 36f4936954a..4bd82be73e3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java
@@ -28,8 +28,6 @@ import org.apache.doris.qe.ConnectContext;
import java.util.Map;
public class CreateRepositoryStmt extends DdlStmt {
- public static String PROP_DELETE_IF_EXISTS = "delete_if_exists";
-
private boolean isReadOnly;
private String name;
private StorageBackend storage;
@@ -73,16 +71,6 @@ public class CreateRepositoryStmt extends DdlStmt {
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
"ADMIN");
}
FeNameFormat.checkCommonName("repository", name);
-
- // check delete_if_exists, this property will be used by
Repository.initRepository.
- Map<String, String> properties = getProperties();
- String deleteIfExistsStr = properties.get(PROP_DELETE_IF_EXISTS);
- if (deleteIfExistsStr != null) {
- if (!deleteIfExistsStr.equalsIgnoreCase("true") &&
!deleteIfExistsStr.equalsIgnoreCase("false")) {
- ErrorReport.reportAnalysisException(ErrorCode.ERR_COMMON_ERROR,
- "'" + PROP_DELETE_IF_EXISTS + "' in properties, you
should set it false or true");
- }
- }
}
@Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java
index 7b7c9799acf..879f248f6a1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java
@@ -17,7 +17,6 @@
package org.apache.doris.backup;
-import org.apache.doris.analysis.CreateRepositoryStmt;
import org.apache.doris.analysis.StorageBackend;
import org.apache.doris.backup.Status.ErrCode;
import org.apache.doris.catalog.Env;
@@ -222,26 +221,6 @@ public class Repository implements Writable {
return Status.OK;
}
- // A temporary solution is to delete all stale snapshots before
creating an S3 repository
- // so that we can add regression tests about backup/restore.
- //
- // TODO: support hdfs/brokers
- if (fileSystem instanceof S3FileSystem) {
- String deleteStaledSnapshots = fileSystem.getProperties()
- .getOrDefault(CreateRepositoryStmt.PROP_DELETE_IF_EXISTS,
"false");
- if (deleteStaledSnapshots.equalsIgnoreCase("true")) {
- // delete with prefix:
- // eg. __palo_repository_repo_name/
- String snapshotPrefix =
Joiner.on(PATH_DELIMITER).join(location, joinPrefix(PREFIX_REPO, name));
- LOG.info("property {} is set, delete snapshots with prefix:
{}",
- CreateRepositoryStmt.PROP_DELETE_IF_EXISTS,
snapshotPrefix);
- Status st = ((S3FileSystem)
fileSystem).deleteDirectory(snapshotPrefix);
- if (!st.ok()) {
- return st;
- }
- }
- }
-
String repoInfoFilePath = assembleRepoInfoFilePath();
// check if the repo is already exist in remote
List<RemoteFile> remoteFiles = Lists.newArrayList();
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
index 64ebeb03a0a..354cebc835f 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
@@ -855,8 +855,7 @@ class Syncer {
"s3.endpoint" = "http://${endpoint}";,
"s3.region" = "${region}",
"s3.access_key" = "${ak}",
- "s3.secret_key" = "${sk}",
- "delete_if_exists" = "true"
+ "s3.secret_key" = "${sk}"
)
"""
}
diff --git a/regression-test/suites/backup_restore/test_backup_restore.groovy
b/regression-test/suites/backup_restore/test_backup_restore.groovy
index df1e9ff069d..a36d8fce133 100644
--- a/regression-test/suites/backup_restore/test_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore", "backup_restore") {
String suiteName = "test_backup_restore"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String snapshotName = "${suiteName}_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
b/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
index 8fabd2c5c77..9e469a2056d 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_alias", "backup_restore") {
- String repoName = "test_backup_restore_alias_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "backup_restore_alias_db"
String tableName = "test_backup_restore_alias_table"
String aliasName = "test_backup_restore_alias_table_alias"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
b/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
index 40dbb44c56c..7a99214ae46 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_backup_temp_partition.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore_backup_temp_partition", "backup_restore") {
String suiteName = "test_backup_restore_backup_temp_partition"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String snapshotName = "${suiteName}_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
b/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
index fab3174b2b2..70123fdbdfb 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_bloom_filter.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_bloom_filter", "backup_restore") {
- String repoName = "test_backup_restore_bloom_filter_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "test_backup_restore_bloom_filter_db"
String tableName = "test_backup_restore_bloom_filter_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_db.groovy
b/regression-test/suites/backup_restore/test_backup_restore_db.groovy
index 600ad8510c8..08b9f619d4f 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_db.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_db.groovy
@@ -18,7 +18,7 @@
suite("test_backup_restore_db", "backup_restore") {
String dbName = "backup_restore_db_1"
String suiteName = "test_backup_restore_db"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableNamePrefix = "${suiteName}_tables"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
b/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
index 889c2e6fdbc..07c79e40172 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_diff_repo_same_snapshot.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore_diff_repo_same_snapshot", "backup_restore") {
String suiteName = "test_backup_restore_diff_repo_same_snapshot"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String snapshotName = "${suiteName}_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
b/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
index a0fe822f9f2..99329b2f3cc 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_dup_without_default_keys.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_dup_without_default_keys", "backup_restore") {
- String repoName = "test_backup_restore_dup_without_default_keys_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "backup_restore_dup_without_default_keys_db"
String tableName = "dup_without_keys_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
b/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
index de54fbfbe9e..e29ebfe3b6b 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
@@ -18,7 +18,7 @@
suite("test_backup_restore_exclude", "backup_restore") {
String dbName = "backup_restore_exclude"
String suiteName = "test_backup_restore_exclude"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableNamePrefix = "${suiteName}_tables"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
b/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
index 4e99b42654c..5f04407b80c 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_inverted_index.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_inverted_index", "backup_restore") {
- String repoName = "test_backup_restore_inverted_index_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "test_backup_restore_inverted_index_db"
String tableName = "test_backup_restore_inverted_index_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
b/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
index 3646ec632bb..67152b3f56c 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_mtmv.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore_mtmv", "backup_restore") {
String suiteName = "test_backup_restore_mtmv"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String mvName = "${suiteName}_mv"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
index b4b7f78f6a0..4fa274bbae3 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
@@ -18,7 +18,7 @@
suite("test_backup_restore_multi_tables", "backup_restore") {
String dbName = "backup_restore_multi_tables_db"
String suiteName = "test_backup_restore_multi_tables"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableNamePrefix = "${suiteName}_tables"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
index 28261acfc02..30dc63dd195 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables_overwrite.groovy
@@ -18,7 +18,7 @@
suite("test_backup_restore_multi_tables_overwrite", "backup_restore") {
String dbName = "backup_restore_multi_tables_overwrite_db"
String suiteName = "test_backup_restore_multi_tables_overwrite"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableNamePrefix = "${suiteName}_tables"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
b/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
index ea97c7c2c07..55af0dcad63 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_ngram_bloom_filter.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore_ngram_bloom_filter", "backup_restore") {
String suiteName = "test_backup_restore_ngram_bloom_filter"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String snapshotName = "${suiteName}_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
b/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
index b86642672ea..82344a63041 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_overwrite_indexes.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore_overwrite_indexes", "backup_restore") {
String suiteName = "test_backup_restore_overwrite_indexes"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String newDbName = "${suiteName}_new_db"
String tableName = "${suiteName}_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
b/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
index 0ce37b967d6..cf34e8d2750 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
@@ -18,7 +18,7 @@
suite("test_backup_restore_partition", "backup_restore") {
String suiteName = "test_backup_restore_partition"
String dbName = "${suiteName}_db"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableName = "${suiteName}_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
index e6c059beec3..d222627c21c 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_false.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_reserve_dynamic_partition_false", "backup_restore")
{
- String repoName =
"test_backup_restore_dynamic_partition_reserve_false_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "backup_restore_dynamic_partition_reserve_false_db"
String tableName = "dynamic_partition_reserve_false_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
index b16f90d52d4..6e83d636359 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_reserve_dynamic_partition_true.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_dynamic_partition_reserve_true", "backup_restore") {
- String repoName = "test_backup_restore_dynamic_partition_reserve_true_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "backup_restore_dynamic_partition_reserve_true_db"
String tableName = "dynamic_partition_reserve_true_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
b/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
index f303df5f0f5..9fd56ced133 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_table_auto_bucket.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_backup_restore_table_auto_bucket", "backup_restore") {
- String repoName = "test_backup_restore_table_auto_bucket_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "backup_restore_table_with_auto_bucket_db"
String tableName = "auto_bucket_table"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_with.groovy
b/regression-test/suites/backup_restore/test_backup_restore_with.groovy
index cacb9df6de5..4ad04666bc2 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_with.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_with.groovy
@@ -18,7 +18,7 @@
suite("test_backup_restore_with_view", "backup_restore") {
String suiteName = "backup_restore_with_view"
String dbName = "${suiteName}_db"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableName = "${suiteName}_table"
String viewName = "${suiteName}_view"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
b/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
index 17267a76cd3..7c39e18a685 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_with_hdfs.groovy
@@ -23,7 +23,7 @@ suite("test_backup_restore_with_hdfs", "backup_restore") {
return
}
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String snapshotName = "${suiteName}_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
b/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
index 2a9ede23269..32f7c4046f7 100644
---
a/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
+++
b/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
@@ -17,7 +17,7 @@
suite("test_backup_restore_with_two_phase_fetch_opt", "backup_restore") {
String suiteName = "test_backup_restore_with_two_phase_fetch_opt"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "${suiteName}_db"
String tableName = "${suiteName}_table"
String snapshotName = "${suiteName}_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
b/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
index d1f3cc9e094..d182a9b04fa 100644
--- a/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_duplicate_backup_restore", "backup_restore") {
- String repoName = "test_duplicate_backup_restore_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "duplicate_backup_restore_db"
String tableName = "test_duplicate_backup_restore_table"
@@ -81,7 +81,7 @@ suite("test_duplicate_backup_restore", "backup_restore") {
sql "DELETE FROM ${dbName}.${tableName} WHERE id = 1"
result = sql "SELECT * FROM ${dbName}.${tableName}"
assertEquals(result.size(), values.size() + 5 - 3)
- repoName = "test_duplicate_delete_backup_restore_repo"
+ repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
syncer.createS3Repository(repoName)
snapshotName = "test_duplicate_delete_backup_restore_snapshot"
sql """
diff --git
a/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
b/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
index 973acc3eec5..aea46af179d 100644
---
a/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
+++
b/regression-test/suites/backup_restore/test_restore_mix_exists_and_new_table.groovy
@@ -18,7 +18,7 @@
suite("test_restore_mix_exists_and_new_table", "backup_restore") {
String dbName = "restore_mix_exists_and_new_table"
String suiteName = "test_restore_mix_exists_and_new_table"
- String repoName = "${suiteName}_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String snapshotName = "${suiteName}_snapshot"
String tableNamePrefix = "${suiteName}_tables"
diff --git
a/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
b/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
index 14abb1fc33c..915afb0bcde 100644
--- a/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
+++ b/regression-test/suites/backup_restore/test_restore_to_new_table.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_restore_to_new_table", "backup_restore") {
- String repoName = "test_restore_to_new_table_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "restore_to_new_table_db"
String tableName = "test_restore_to_new_table_table"
String snapshotName = "test_backup_restore_snapshot"
diff --git
a/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
b/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
index 44d54fcafc3..24ae396d331 100644
--- a/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
@@ -16,7 +16,7 @@
// under the License.
suite("test_unique_backup_restore", "backup_restore") {
- String repoName = "test_unique_backup_restore_repo"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
String dbName = "unique_backup_restore_db"
String tableName = "test_unique_backup_restore_table"
@@ -81,7 +81,7 @@ suite("test_unique_backup_restore", "backup_restore") {
sql "DELETE FROM ${dbName}.${tableName} WHERE id = 1"
result = sql "SELECT * FROM ${dbName}.${tableName}"
assertEquals(result.size(), 1)
- repoName = "test_unique_delete_backup_restore_repo"
+ repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
syncer.createS3Repository(repoName)
snapshotName = "test_unique_delete_backup_restore_snapshot"
sql """
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
