This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 57fb1df8335 [fix](regression) backup restore cases adapt
force_olap_table_replica_num option (#27986)
57fb1df8335 is described below
commit 57fb1df83357137eb45415a40740619f22bbc7fa
Author: walter <w41te...@gmail.com>
AuthorDate: Wed Dec 6 08:23:40 2023 +0800
[fix](regression) backup restore cases adapt force_olap_table_replica_num
option (#27986)
---
regression-test/suites/backup_restore/test_backup_restore.groovy | 2 +-
.../suites/backup_restore/test_backup_restore_alias.groovy | 2 +-
regression-test/suites/backup_restore/test_backup_restore_db.groovy | 2 +-
.../test_backup_restore_diff_repo_same_snapshot.groovy | 4 ++--
.../test_backup_restore_dup_without_default_keys.groovy | 4 ++--
.../suites/backup_restore/test_backup_restore_exclude.groovy | 2 +-
.../suites/backup_restore/test_backup_restore_multi_tables.groovy | 2 +-
.../test_backup_restore_multi_tables_overwrite.groovy | 2 +-
.../suites/backup_restore/test_backup_restore_partition.groovy | 4 ++--
.../test_backup_restore_reserve_dynamic_partition_false.groovy | 4 ++--
.../test_backup_restore_reserve_dynamic_partition_true.groovy | 4 ++--
.../backup_restore/test_backup_restore_table_auto_bucket.groovy | 4 ++--
.../suites/backup_restore/test_duplicate_backup_restore.groovy | 4 ++--
.../backup_restore/test_restore_mix_exists_and_new_table.groovy | 2 +-
.../suites/backup_restore/test_restore_to_new_table.groovy | 2 +-
.../suites/backup_restore/test_unique_backup_restore.groovy | 6 +++---
16 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/regression-test/suites/backup_restore/test_backup_restore.groovy
b/regression-test/suites/backup_restore/test_backup_restore.groovy
index 68f73f6892f..2775a0a11b3 100644
--- a/regression-test/suites/backup_restore/test_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore.groovy
@@ -68,7 +68,7 @@ suite("test_backup_restore", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..6ecf0f9ddf6 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_alias.groovy
@@ -70,7 +70,7 @@ suite("test_backup_restore_alias", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..780b322a212 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_db.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_db.groovy
@@ -76,7 +76,7 @@ suite("test_backup_restore_db", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..da5fe12df14 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
@@ -89,7 +89,7 @@ suite("test_backup_restore_diff_repo_same_snapshot",
"backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
@@ -112,7 +112,7 @@ suite("test_backup_restore_diff_repo_same_snapshot",
"backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..c0f6a12f972 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
@@ -69,7 +69,7 @@ suite("test_backup_restore_dup_without_default_keys",
"backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
while (!syncer.checkAllRestoreFinish(dbName)) {
@@ -81,4 +81,4 @@ suite("test_backup_restore_dup_without_default_keys",
"backup_restore") {
sql "DROP TABLE ${dbName}.${tableName} FORCE"
sql "DROP DATABASE ${dbName} FORCE"
sql "DROP REPOSITORY `${repoName}`"
-}
\ No newline at end of file
+}
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..c499ee244cb 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_exclude.groovy
@@ -82,7 +82,7 @@ suite("test_backup_restore_exclude", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..54f08cba8e6 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
@@ -79,7 +79,7 @@ suite("test_backup_restore_multi_tables", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..5eb3bc982e8 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
@@ -80,7 +80,7 @@ suite("test_backup_restore_multi_tables_overwrite",
"backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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 7cc448e2baa..60194e34b7b 100644
--- a/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
+++ b/regression-test/suites/backup_restore/test_backup_restore_partition.groovy
@@ -83,7 +83,7 @@ suite("test_backup_restore_partition", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
@@ -102,7 +102,7 @@ suite("test_backup_restore_partition", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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 e1bf2439c69..c51f593766f 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
@@ -94,7 +94,7 @@ suite("test_backup_restore_reserve_dynamic_partition_false",
"backup_restore") {
(
"backup_timestamp" = "${snapshot}",
"reserve_dynamic_partition_enable" = "false",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
while (!syncer.checkAllRestoreFinish(dbName)) {
@@ -111,4 +111,4 @@
suite("test_backup_restore_reserve_dynamic_partition_false", "backup_restore") {
sql "DROP TABLE ${dbName}.${tableName} FORCE"
sql "DROP DATABASE ${dbName} FORCE"
sql "DROP REPOSITORY `${repoName}`"
-}
\ No newline at end of file
+}
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 95f81d8e013..64362407d32 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
@@ -94,7 +94,7 @@ suite("test_backup_restore_dynamic_partition_reserve_true",
"backup_restore") {
(
"backup_timestamp" = "${snapshot}",
"reserve_dynamic_partition_enable" = "true",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
@@ -116,4 +116,4 @@ suite("test_backup_restore_dynamic_partition_reserve_true",
"backup_restore") {
sql "DROP TABLE ${dbName}.${tableName} FORCE"
sql "DROP DATABASE ${dbName} FORCE"
sql "DROP REPOSITORY `${repoName}`"
-}
\ No newline at end of file
+}
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 2b1efb16d55..f0c6b1e812a 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
@@ -67,7 +67,7 @@ suite("test_backup_restore_table_auto_bucket",
"backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
while (!syncer.checkAllRestoreFinish(dbName)) {
@@ -84,4 +84,4 @@ suite("test_backup_restore_table_auto_bucket",
"backup_restore") {
sql "DROP TABLE ${dbName}.${tableName} FORCE"
sql "DROP DATABASE ${dbName} FORCE"
sql "DROP REPOSITORY `${repoName}`"
-}
\ No newline at end of file
+}
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..d82ad431f8e 100644
--- a/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_duplicate_backup_restore.groovy
@@ -69,7 +69,7 @@ suite("test_duplicate_backup_restore", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
@@ -109,7 +109,7 @@ suite("test_duplicate_backup_restore", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
while (!syncer.checkAllRestoreFinish(dbName)) {
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..f21baae0e52 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
@@ -79,7 +79,7 @@ suite("test_restore_mix_exists_and_new_table",
"backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..7d99e9fa33f 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
@@ -68,7 +68,7 @@ suite("test_restore_to_new_table", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
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..eea0620a995 100644
--- a/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
+++ b/regression-test/suites/backup_restore/test_unique_backup_restore.groovy
@@ -69,7 +69,7 @@ suite("test_unique_backup_restore", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
@@ -109,7 +109,7 @@ suite("test_unique_backup_restore", "backup_restore") {
PROPERTIES
(
"backup_timestamp" = "${snapshot}",
- "replication_num" = "1"
+ "reserve_replica" = "true"
)
"""
while (!syncer.checkAllRestoreFinish(dbName)) {
@@ -120,4 +120,4 @@ suite("test_unique_backup_restore", "backup_restore") {
sql "DROP TABLE ${dbName}.${tableName} FORCE"
sql "DROP DATABASE ${dbName} FORCE"
sql "DROP REPOSITORY `${repoName}`"
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
