Merge branch 'clusterfixes' into unstable

This commit is contained in:
antirez 2015-01-22 16:31:14 +01:00
commit ca14440aa1

View File

@ -27,12 +27,17 @@ test "Cluster nodes are reachable" {
test "Cluster nodes hard reset" { test "Cluster nodes hard reset" {
foreach_redis_id id { foreach_redis_id id {
if {$::valgrind} {
set node_timeout 10000
} else {
set node_timeout 3000
}
catch {R $id flushall} ; # May fail for readonly slaves. catch {R $id flushall} ; # May fail for readonly slaves.
R $id MULTI R $id MULTI
R $id cluster reset hard R $id cluster reset hard
R $id cluster set-config-epoch [expr {$id+1}] R $id cluster set-config-epoch [expr {$id+1}]
R $id EXEC R $id EXEC
R $id config set cluster-node-timeout 3000 R $id config set cluster-node-timeout $node_timeout
R $id config set cluster-slave-validity-factor 10 R $id config set cluster-slave-validity-factor 10
R $id config rewrite R $id config rewrite
} }