fix(test): fix test config (#8586)

risingwavelabs · Mar 16, 2023 · c683098 · c683098
1 parent bcb324b
commit c683098
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/src/config/ci-meta-backup-test.toml b/src/config/ci-meta-backup-test.toml
@@ -2,7 +2,3 @@
 min_sst_retention_time_sec = 0
 collect_gc_watermark_spin_interval_sec = 1
 vacuum_interval_sec = 10
-
-[backup]
-storage_url = "minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001"
-storage_directory = "backup"
diff --git a/src/storage/backup/integration_tests/common.sh b/src/storage/backup/integration_tests/common.sh
@@ -19,10 +19,9 @@ function clean_etcd_data() {
 
 function start_cluster() {
   cargo make d ci-meta-backup-test 1>/dev/null 2>&1
-}
-
-function wait_cluster_ready() {
-  # TODO #6482: wait cluster to finish actor migration and other recovery stuff deterministically.
+  execute_sql_and_expect \
+  "alter system set  backup_storage_url to \"minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001\";" \
+  "ALTER_SYSTEM"
   sleep 5
 }
 

diff --git a/src/storage/backup/integration_tests/test_basic.sh b/src/storage/backup/integration_tests/test_basic.sh
@@ -43,7 +43,6 @@ if ! psql -h localhost -p 4566 -d dev -U root -c "show materialized views;" | gr
   exit 1
 fi
 echo "restore snapshot ${job_id_2} succeeded"
-wait_cluster_ready
 query_mvs
 # any other ops in the restored cluster
 drop_mvs