Wait for asyn_loading to stop in short read test (redis#9841)

In redis#9323, when `repl-diskless-load` is enabled and set to `swapdb`, if the master replication ID hasn't changed, we can load data-set asynchronously, and serving read commands during the full resync. In `diskless loading short read` test, after a loading successfully, we will wait for the loading to stop and continue the for loop. After the introduction of `async_loading`, we also need to check it. Otherwise the next loop will start too soon, may trigger a timing issue.
hwware · Dec 20, 2021 · ef9e84f · ef9e84f
1 parent ac55248
commit ef9e84f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
@@ -688,8 +688,11 @@ test {diskless loading short read} {
                     }
                     $master exec
                 }
+
                 # wait for loading to stop (fail)
+                # After a loading successfully, next loop will enter `async_loading`
                 wait_for_condition 1000 1 {
+                    [s -1 async_loading] eq 0 &&
                     [s -1 loading] eq 0
                 } else {
                     fail "Replica didn't disconnect"

diff --git a/tests/unit/moduleapi/testrdb.tcl b/tests/unit/moduleapi/testrdb.tcl
@@ -114,8 +114,11 @@ tags "modules" {
                             }
                             $master exec
                         }
+
                         # wait for loading to stop (fail)
+                        # After a loading successfully, next loop will enter `async_loading`
                         wait_for_condition 1000 1 {
+                            [s -1 async_loading] eq 0 &&
                             [s -1 loading] eq 0
                         } else {
                             fail "Replica didn't disconnect"