summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2015-01-21 18:48:08 +0100
committerantirez <antirez@gmail.com>2015-01-22 11:12:28 +0100
commit7e41200b98ecf1ac79fb342c6486e5a270729f85 (patch)
treea401a89291b31a3f60c354a0a7e5cb674b07e492
parentebb07a0b487641b8a208a836dee130a808ab19ce (diff)
downloadredis-7e41200b98ecf1ac79fb342c6486e5a270729f85.tar.gz
Cluster test initialization: use transaction for reset + set-config-epoch.
Otherwise between the two commands other nodes may contact us making the next SET-CONFIG-EPOCH call impossible.
-rw-r--r--tests/cluster/tests/includes/init-tests.tcl2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/cluster/tests/includes/init-tests.tcl b/tests/cluster/tests/includes/init-tests.tcl
index 65fc806e1..117f79208 100644
--- a/tests/cluster/tests/includes/init-tests.tcl
+++ b/tests/cluster/tests/includes/init-tests.tcl
@@ -28,8 +28,10 @@ test "Cluster nodes are reachable" {
test "Cluster nodes hard reset" {
foreach_redis_id id {
catch {R $id flushall} ; # May fail for readonly slaves.
+ R $id MULTI
R $id cluster reset hard
R $id cluster set-config-epoch [expr {$id+1}]
+ R $id EXEC
R $id config set cluster-node-timeout 3000
R $id config set cluster-slave-validity-factor 10
R $id config rewrite