daily ci test: aof rewrite limit in FreeBSD

redis · Jan 23, 2022 · 7d4f50f · 7d4f50f
1 parent 23325c1
commit 7d4f50f
Showing 1 changed file with 12 additions and 30 deletions.
diff --git a/tests/integration/aof-multi-part.tcl b/tests/integration/aof-multi-part.tcl
@@ -778,13 +778,8 @@ tags {"external:skip"} {
             r config set auto-aof-rewrite-percentage 0 ; # Disable auto-rewrite.
             waitForBgrewriteaof r
 
-            # Start write load
-            set load_handle0 [start_write_load $master_host $master_port 10]
-
-            wait_for_condition 50 100 {
-                [r dbsize] > 0
-            } else {
-                fail "No write load detected."
+            for {set j 0} {$j < 100} {incr j} {
+                r set [expr rand()] [expr rand()]
             }
 
             # First AOFRW done
@@ -818,9 +813,6 @@ tags {"external:skip"} {
             assert_equal 1 [check_file_exist $aof_dirpath "${aof_basename}.2${::base_aof_sufix}${::rdb_format_suffix}"]
             assert_equal 1 [check_file_exist $aof_dirpath "${aof_basename}.2${::incr_aof_sufix}${::aof_format_suffix}"]
 
-            stop_write_load $load_handle0
-            wait_load_handlers_disconnected
-
             set d1 [r debug digest]
             r debug loadaof
             set d2 [r debug digest]
@@ -831,13 +823,8 @@ tags {"external:skip"} {
             # Start write load
             r config set rdb-key-save-delay 10000000
 
-            set orig_size [r dbsize]
-            set load_handle0 [start_write_load $master_host $master_port 10]
-
-            wait_for_condition 50 100 {
-                [r dbsize] > $orig_size
-            } else {
-                fail "No write load detected."
+            for {set j 0} {$j < 100} {incr j} {
+                r set [expr rand()] [expr rand()]
             }
 
             # Let AOFRW fail three times
@@ -875,9 +862,6 @@ tags {"external:skip"} {
             assert_equal 1 [check_file_exist $aof_dirpath "${aof_basename}.4${::incr_aof_sufix}${::aof_format_suffix}"]
             assert_equal 1 [check_file_exist $aof_dirpath "${aof_basename}.5${::incr_aof_sufix}${::aof_format_suffix}"]
 
-            stop_write_load $load_handle0
-            wait_load_handlers_disconnected
-
             set d1 [r debug digest]
             r debug loadaof
             set d2 [r debug digest]
@@ -1111,15 +1095,16 @@ tags {"external:skip"} {
                 {file appendonly.aof.7.incr.aof seq 7 type i}
             }
 
-            set orig_size [r dbsize]
-            set load_handle0 [start_write_load $master_host $master_port 10]
-
-            wait_for_condition 50 100 {
-                [r dbsize] > $orig_size
-            } else {
-                fail "No write load detected."
+            for {set j 0} {$j < 20000} {incr j} {
+                r set [expr rand()] [expr rand()]
             }
 
+            set dbsize [r dbsize]
+            set res [s aof_current_size]
+            set res2 [r config get auto-aof-rewrite-min-size]
+            # aof_current_size: 1308480, min-size: auto-aof-rewrite-min-size 1048576, dbsize: 20201
+            puts "aof_current_size: $res, min-size: $res2, dbsize: $dbsize"
+
             # Make sure we have limit log
             wait_for_condition 1000 10 {
                 [count_log_message 0 "triggered the limit"] == 1
@@ -1158,9 +1143,6 @@ tags {"external:skip"} {
                 {file appendonly.aof.8.incr.aof seq 8 type i}
             }
 
-            stop_write_load $load_handle0
-            wait_load_handlers_disconnected
-
             set d1 [r debug digest]
             r debug loadaof
             set d2 [r debug digest]