Merge branch 'main' into hy/fix_issue_18747

risingwavelabs · Oct 2, 2024 · 47dd54c · 47dd54c
2 parents 31622ce + 66890db
commit 47dd54c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/config/ci-meta-backup-test.toml b/src/config/ci-meta-backup-test.toml
@@ -1,5 +1,5 @@
 [meta]
-min_sst_retention_time_sec = 0
+min_sst_retention_time_sec = 5
 collect_gc_watermark_spin_interval_sec = 1
 vacuum_interval_sec = 10
 

diff --git a/src/config/ci-time-travel.toml b/src/config/ci-time-travel.toml
@@ -1,6 +1,5 @@
 [meta]
 hummock_time_travel_snapshot_interval = 30
-min_sst_retention_time_sec = 1
 
 [system]
 time_travel_retention_ms = 300000
diff --git a/src/storage/backup/integration_tests/test_pin_sst.sh b/src/storage/backup/integration_tests/test_pin_sst.sh
@@ -18,6 +18,8 @@ echo "try to backup meta after creating mvs"
 job_id_2=$(backup)
 echo "create snapshot ${job_id_2} succeeded"
 
+sleep 5
+
 restore "${job_id_1}"
 start_cluster
 sst_count_before_gc=$(get_total_sst_count)