diff options
author | antirez <antirez@gmail.com> | 2016-05-05 11:49:27 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2016-05-05 13:45:20 +0200 |
commit | 97ce72fa2d348f914fc40ccf0a32008c7362b817 (patch) | |
tree | 64c58a365bee50f249223ba9ac3520902c3d7f6b | |
parent | 708f486c77b455fa7ae1e87cf31278474eb9d432 (diff) | |
download | redis-97ce72fa2d348f914fc40ccf0a32008c7362b817.tar.gz |
Cluster test 12: reshard back just a few slots to speedup the test.
-rw-r--r-- | tests/cluster/tests/12-replica-migration-2.tcl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/cluster/tests/12-replica-migration-2.tcl b/tests/cluster/tests/12-replica-migration-2.tcl index cd8b33b3e..48ecd1d50 100644 --- a/tests/cluster/tests/12-replica-migration-2.tcl +++ b/tests/cluster/tests/12-replica-migration-2.tcl @@ -6,21 +6,21 @@ source "../tests/includes/init-tests.tcl" -# Create a cluster with 5 master and 10 slaves, so that we have 2 -# slaves for each master. +# 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. test "Create a 5 nodes cluster" { - create_cluster 5 10 + create_cluster 5 15 } test "Cluster is up" { assert_cluster_state ok } -test "Each master should have two replicas attached" { +test "Each master should have at least two replicas attached" { foreach_redis_id id { if {$id < 5} { wait_for_condition 1000 50 { - [llength [lindex [R 0 role] 2]] == 2 + [llength [lindex [R 0 role] 2]] >= 2 } else { fail "Master #$id does not have 2 slaves as expected" } @@ -44,13 +44,13 @@ test "Master #0 should lose its replicas" { } } -test "Resharding all the master #0 slots back to it" { +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-trib.rb rebalance \ - --weight ${master0_id}=1 \ + --weight ${master0_id}=.01 \ --use-empty-masters \ 127.0.0.1:[get_instance_attrib redis 0 port] >@ stdout] } |