From d364ede59cb3c4e7b448450fa68e54b955bb220c Mon Sep 17 00:00:00 2001 From: Oran Agra Date: Mon, 31 Jan 2022 01:47:58 +0200 Subject: Revent the attempt to fix cluster rebalance test (#10207) (#10212) It seems that fix didn't really solve the problem with ASAN, and also introduced issues with other CI runs. unrelated: - make runtest-cluster able to take multiple --single arguments --- tests/cluster/tests/12-replica-migration-2.tcl | 18 +++--------------- tests/cluster/tests/12.1-replica-migration-3.tcl | 4 ---- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'tests/cluster') diff --git a/tests/cluster/tests/12-replica-migration-2.tcl b/tests/cluster/tests/12-replica-migration-2.tcl index 679eaa3a4..aecae0429 100644 --- a/tests/cluster/tests/12-replica-migration-2.tcl +++ b/tests/cluster/tests/12-replica-migration-2.tcl @@ -6,7 +6,6 @@ source "../tests/includes/init-tests.tcl" source "../../../tests/support/cli.tcl" -source "../tests/includes/utils.tcl" # Create a cluster with 5 master and 15 slaves, to make sure there are no # empty masters and make rebalancing simpler to handle during the test. @@ -30,10 +29,6 @@ test "Each master should have at least two replicas attached" { } } -test "Wait cluster to be stable" { - wait_cluster_stable -} - test "Set allow-replica-migration yes" { foreach_redis_id id { R $id CONFIG SET cluster-allow-replica-migration yes @@ -58,13 +53,10 @@ test "Master #0 should lose its replicas" { } } -# Wait for the cluster config to propagate before attempting a -# new resharding. -test "Wait cluster to be stable" { - wait_cluster_stable -} - test "Resharding back some slot to master #0" { + # Wait for the cluster config to propagate before attempting a + # new resharding. + after 10000 set output [exec \ ../../../src/redis-cli --cluster rebalance \ 127.0.0.1:[get_instance_attrib redis 0 port] \ @@ -73,10 +65,6 @@ test "Resharding back some slot to master #0" { --cluster-use-empty-masters >@ stdout] } -test "Wait cluster to be stable" { - wait_cluster_stable -} - test "Master #0 should re-acquire one or more replicas" { wait_for_condition 1000 50 { [llength [lindex [R 0 role] 2]] >= 1 diff --git a/tests/cluster/tests/12.1-replica-migration-3.tcl b/tests/cluster/tests/12.1-replica-migration-3.tcl index 1227fd71a..7e0090845 100644 --- a/tests/cluster/tests/12.1-replica-migration-3.tcl +++ b/tests/cluster/tests/12.1-replica-migration-3.tcl @@ -34,10 +34,6 @@ test "Set allow-replica-migration no" { } } -test "Wait cluster to be stable" { - wait_cluster_stable -} - set master0_id [dict get [get_myself 0] id] test "Resharding all the master #0 slots away from it" { set output [exec \ -- cgit v1.2.1