Permalink
Browse files

Regression test for the main problem causing issue #141. Minor change…

…s/fixes/additions to the test suite itself needed to write the test.
  • Loading branch information...
1 parent d4945b2 commit 2c2b6159d321fd155668270febe7d8dbe7df5eb5 @antirez committed Jan 6, 2012
Showing with 85 additions and 2 deletions.
  1. +15 −0 tests/helpers/gen_write_load.tcl
  2. +68 −0 tests/integration/replication.tcl
  3. +1 −1 tests/support/test.tcl
  4. +1 −1 tests/test_helper.tcl
@@ -0,0 +1,15 @@
+source tests/support/redis.tcl
+
+proc gen_write_load {host port seconds} {
+ set start_time [clock seconds]
+ set r [redis $host $port 1]
+ $r select 9
+ while 1 {
+ $r set [expr rand()] [expr rand()]
+ if {[clock seconds]-$start_time > $seconds} {
+ exit 0
+ }
+ }
+}
+
+gen_write_load [lindex $argv 0] [lindex $argv 1] [lindex $argv 2]
@@ -65,3 +65,71 @@ start_server {tags {"repl"}} {
} {0 0}
}
}
+
+proc start_write_load {host port seconds} {
+ exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds &
+}
+
+proc stop_write_load {handle} {
+ catch {exec /bin/kill -9 $handle}
+}
+
+start_server {tags {"repl"}} {
+ set master [srv 0 client]
+ set master_host [srv 0 host]
+ set master_port [srv 0 port]
+ set slaves {}
+ set load_handle0 [start_write_load $master_host $master_port 20]
+ set load_handle1 [start_write_load $master_host $master_port 20]
+ set load_handle2 [start_write_load $master_host $master_port 20]
+ set load_handle3 [start_write_load $master_host $master_port 20]
+ set load_handle4 [start_write_load $master_host $master_port 20]
+ after 2000
+ start_server {} {
+ lappend slaves [srv 0 client]
+ start_server {} {
+ lappend slaves [srv 0 client]
+ start_server {} {
+ lappend slaves [srv 0 client]
+ test "Connect multiple slaves at the same time (issue #141)" {
+ [lindex $slaves 0] slaveof $master_host $master_port
+ [lindex $slaves 1] slaveof $master_host $master_port
+ [lindex $slaves 2] slaveof $master_host $master_port
+
+ # Wait for all the three slaves to reach the "online" state
+ set retry 100
+ while {$retry} {
+ set info [r -3 info]
+ if {[string match {*slave0:*,online*slave1:*,online*slave2:*,online*} $info]} {
+ break
+ } else {
+ incr retry -1
+ after 100
+ }
+ }
+ if {$retry == 0} {
+ error "assertion:Slaves not correctly synchronized"
+ }
+ stop_write_load $load_handle0
+ stop_write_load $load_handle1
+ stop_write_load $load_handle2
+ stop_write_load $load_handle3
+ stop_write_load $load_handle4
+ after 1000
+ set digest [$master debug digest]
+ set digest0 [[lindex $slaves 0] debug digest]
+ set digest1 [[lindex $slaves 1] debug digest]
+ set digest2 [[lindex $slaves 2] debug digest]
+ assert {$digest ne 0000000000000000000000000000000000000000}
+ assert {$digest eq $digest0}
+ assert {$digest eq $digest1}
+ assert {$digest eq $digest2}
+ #puts [$master dbsize]
+ #puts [[lindex $slaves 0] dbsize]
+ #puts [[lindex $slaves 1] dbsize]
+ #puts [[lindex $slaves 2] dbsize]
+ }
+ }
+ }
+ }
+}
View
@@ -4,7 +4,7 @@ set ::num_failed 0
set ::tests_failed {}
proc assert {condition} {
- if {![uplevel 1 expr $condition]} {
+ if {![uplevel 1 [list expr $condition]]} {
error "assertion:Expected condition '$condition' to be true ([uplevel 1 [list subst -nocommands $condition]])"
}
}
View
@@ -113,7 +113,7 @@ proc reconnect {args} {
}
# re-set $srv in the servers list
- set ::servers [lreplace $::servers end+$level 1 $srv]
+ lset ::servers end+$level $srv
}
proc redis_deferring_client {args} {

0 comments on commit 2c2b615

Please sign in to comment.