This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new f02c8c77dbb [chore](backup) Remove delete_if_exists properties for
creating repository (#38194)
f02c8c77dbb is described below
commit f02c8c77dbb63a1a165310fe05000fae42f69b03
Author: walter <[email protected]>
AuthorDate: Tue Jul 23 11:06:57 2024 +0800
[chore](backup) Remove delete_if_exists properties for creating repository
(#38194)
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 | 9 +++++----
.../backup_restore/test_backup_restore_alias.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_multi_tables.groovy | 2 +-
...est_backup_restore_multi_tables_overwrite.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 ++--
16 files changed, 20 insertions(+), 53 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 0cb30dd7a36..539a2618eee 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 f58ffa63a51..7105912c7c1 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;
@@ -221,26 +220,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 5c32cc48aa4..b29321c967f 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
@@ -818,8 +818,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 68f73f6892f..9ae552c1131 100644
--- a/regression-test/suites/backup_restore/test_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore.groovy
@@ -16,9 +16,11 @@
// under the License.
suite("test_backup_restore", "backup_restore") {
- String repoName = "test_backup_restore_repo"
- String dbName = "backup_restore_db"
- String tableName = "test_backup_restore_table"
+ String suiteName = "test_backup_restore"
+ String repoName = "repo_" + UUID.randomUUID().toString().replace("-", "")
+ String dbName = "${suiteName}_db"
+ String tableName = "${suiteName}_table"
+ String snapshotName = "${suiteName}_snapshot"
def syncer = getSyncer()
syncer.createS3Repository(repoName)
@@ -45,7 +47,6 @@ suite("test_backup_restore", "backup_restore") {
def result = sql "SELECT * FROM ${dbName}.${tableName}"
assertEquals(result.size(), values.size());
- String snapshotName = "test_backup_restore_snapshot"
sql """
BACKUP SNAPSHOT ${dbName}.${snapshotName}
TO `${repoName}`
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 57851fa8244..8107e7eaa1f 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_db.groovy
b/regression-test/suites/backup_restore/test_backup_restore_db.groovy
index 7f3c6e5f83e..ffcd6ce005e 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 19e2e2fd048..dcb9337c9b5 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 0266e73eaa2..2b77fb88b71 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 012d77cc75d..c17f967a510 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_multi_tables.groovy
b/regression-test/suites/backup_restore/test_backup_restore_multi_tables.groovy
index a795ae0dedf..487e56bbbd7 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 67cf37bc6e0..485d04d3659 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_with_two_phase_fetch_opt.groovy
b/regression-test/suites/backup_restore/test_backup_restore_with_two_phase_fetch_opt.groovy
index 49c3c89b351..7600b83bf7b 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 a3117feb30e..bfd1f54a8ce 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"
@@ -85,7 +85,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 7bb6c91c193..8228668a795 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 76f82eb8c9c..2e31a5ab674 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 b1092871fd9..eb24e9357a7 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"
@@ -85,7 +85,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]