gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Slave removal: remove slave from integration tests descriptions.

Browse Source
This commit is contained in:
antirez 2018-09-11 11:03:28 +02:00
parent 52e7192e4a
commit 4cf8fdbbd3
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/block-repl.tcl
View File

@ -49,7 +49,7 @@ start_server {tags {"repl"}} {
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts -nonewline $fd $csv2 puts -nonewline $fd $csv2
close $fd close $fd
puts "Master - Slave inconsistency" puts "Master - Replica inconsistency"
puts "Run diff -u against /tmp/repldump*.txt for more info" puts "Run diff -u against /tmp/repldump*.txt for more info"
} }
assert_equal [r debug digest] [r -1 debug digest] assert_equal [r debug digest] [r -1 debug digest]

6
tests/integration/psync2-reg.tcl
View File

@ -29,7 +29,7 @@ start_server {} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[$R(1) dbsize] == 1 && [$R(2) dbsize] == 1 [$R(1) dbsize] == 1 && [$R(2) dbsize] == 1
} else { } else {
fail "Slaves not replicating from master" fail "Replicas not replicating from master"
} }
$R(0) config set repl-backlog-size 10mb $R(0) config set repl-backlog-size 10mb
$R(1) config set repl-backlog-size 10mb $R(1) config set repl-backlog-size 10mb
@ -41,12 +41,12 @@ start_server {} {
set elapsed [expr {[clock milliseconds]-$cycle_start_time}] set elapsed [expr {[clock milliseconds]-$cycle_start_time}]
if {$elapsed > $duration*1000} break if {$elapsed > $duration*1000} break
if {rand() < .05} { if {rand() < .05} {
test "PSYNC2 #3899 regression: kill first slave" { test "PSYNC2 #3899 regression: kill first replica" {
$R(1) client kill type master $R(1) client kill type master
} }
} }
if {rand() < .05} { if {rand() < .05} {
test "PSYNC2 #3899 regression: kill chained slave" { test "PSYNC2 #3899 regression: kill chained replica" {
$R(2) client kill type master $R(2) client kill type master
} }
} }

14
tests/integration/psync2.tcl
View File

@ -95,7 +95,7 @@ start_server {} {
if {$disconnect} { if {$disconnect} {
$R($slave_id) client kill type master $R($slave_id) client kill type master
if {$debug_msg} { if {$debug_msg} {
puts "+++ Breaking link for slave #$slave_id" puts "+++ Breaking link for replica #$slave_id"
} }
} }
} }
@ -158,7 +158,7 @@ start_server {} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[status $R($master_id) connected_slaves] == 4 [status $R($master_id) connected_slaves] == 4
} else { } else {
fail "Slave not reconnecting" fail "Replica not reconnecting"
} }
} }
@ -173,13 +173,13 @@ start_server {} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[status $R($master_id) connected_slaves] == 4 [status $R($master_id) connected_slaves] == 4
} else { } else {
fail "Slave not reconnecting" fail "Replica not reconnecting"
} }
set new_sync_count [status $R($master_id) sync_full] set new_sync_count [status $R($master_id) sync_full]
assert {$sync_count == $new_sync_count} assert {$sync_count == $new_sync_count}
} }
test "PSYNC2: Slave RDB restart with EVALSHA in backlog issue #4483" { test "PSYNC2: Replica RDB restart with EVALSHA in backlog issue #4483" {
# Pick a random slave # Pick a random slave
set slave_id [expr {($master_id+1)%5}] set slave_id [expr {($master_id+1)%5}]
set sync_count [status $R($master_id) sync_full] set sync_count [status $R($master_id) sync_full]
@ -194,7 +194,7 @@ start_server {} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[$R($master_id) debug digest] == [$R($slave_id) debug digest] [$R($master_id) debug digest] == [$R($slave_id) debug digest]
} else { } else {
fail "Slave not reconnecting" fail "Replica not reconnecting"
} }
# Prevent the slave from receiving master updates, and at # Prevent the slave from receiving master updates, and at
@ -228,7 +228,7 @@ start_server {} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[status $R($master_id) connected_slaves] == 4 [status $R($master_id) connected_slaves] == 4
} else { } else {
fail "Slave not reconnecting" fail "Replica not reconnecting"
} }
set new_sync_count [status $R($master_id) sync_full] set new_sync_count [status $R($master_id) sync_full]
assert {$sync_count == $new_sync_count} assert {$sync_count == $new_sync_count}
@ -238,7 +238,7 @@ start_server {} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[$R($master_id) debug digest] == [$R($slave_id) debug digest] [$R($master_id) debug digest] == [$R($slave_id) debug digest]
} else { } else {
fail "Debug digest mismatch between master and slave in post-restart handshake" fail "Debug digest mismatch between master and replica in post-restart handshake"
} }
} }

8
tests/integration/replication-2.tcl
View File

@ -16,7 +16,7 @@ start_server {tags {"repl"}} {
wait_for_condition 50 100 { wait_for_condition 50 100 {
[r -1 get foo] eq {12345} [r -1 get foo] eq {12345}
} else { } else {
fail "Write did not reached slave" fail "Write did not reached replica"
} }
} }
@ -34,7 +34,7 @@ start_server {tags {"repl"}} {
wait_for_condition 50 100 { wait_for_condition 50 100 {
[r -1 get foo] eq {12345} [r -1 get foo] eq {12345}
} else { } else {
fail "Write did not reached slave" fail "Write did not reached replica"
} }
} }
@ -60,7 +60,7 @@ start_server {tags {"repl"}} {
wait_for_condition 50 100 { wait_for_condition 50 100 {
[r -1 get foo] eq {aaabbb} [r -1 get foo] eq {aaabbb}
} else { } else {
fail "Write did not reached slave" fail "Write did not reached replica"
} }
} }
@ -81,7 +81,7 @@ start_server {tags {"repl"}} {
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts -nonewline $fd $csv2 puts -nonewline $fd $csv2
close $fd close $fd
puts "Master - Slave inconsistency" puts "Master - Replica inconsistency"
puts "Run diff -u against /tmp/repldump*.txt for more info" puts "Run diff -u against /tmp/repldump*.txt for more info"
} }
assert_equal [r debug digest] [r -1 debug digest] assert_equal [r debug digest] [r -1 debug digest]

4
tests/integration/replication-3.tcl
View File

@ -25,7 +25,7 @@ start_server {tags {"repl"}} {
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts -nonewline $fd $csv2 puts -nonewline $fd $csv2
close $fd close $fd
puts "Master - Slave inconsistency" puts "Master - Replica inconsistency"
puts "Run diff -u against /tmp/repldump*.txt for more info" puts "Run diff -u against /tmp/repldump*.txt for more info"
} }
assert_equal [r debug digest] [r -1 debug digest] assert_equal [r debug digest] [r -1 debug digest]
@ -98,7 +98,7 @@ start_server {tags {"repl"}} {
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts -nonewline $fd $csv2 puts -nonewline $fd $csv2
close $fd close $fd
puts "Master - Slave inconsistency" puts "Master - Replica inconsistency"
puts "Run diff -u against /tmp/repldump*.txt for more info" puts "Run diff -u against /tmp/repldump*.txt for more info"
} }

2
tests/integration/replication-4.tcl
View File

@ -47,7 +47,7 @@ start_server {tags {"repl"}} {
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts -nonewline $fd $csv2 puts -nonewline $fd $csv2
close $fd close $fd
puts "Master - Slave inconsistency" puts "Master - Replica inconsistency"
puts "Run diff -u against /tmp/repldump*.txt for more info" puts "Run diff -u against /tmp/repldump*.txt for more info"
} }
assert_equal [r debug digest] [r -1 debug digest] assert_equal [r debug digest] [r -1 debug digest]

4
tests/integration/replication-psync.tcl
View File

@ -60,7 +60,7 @@ proc test_psync {descr duration backlog_size backlog_ttl delay cond diskless rec
if ($reconnect) { if ($reconnect) {
for {set j 0} {$j < $duration*10} {incr j} { for {set j 0} {$j < $duration*10} {incr j} {
after 100 after 100
# catch {puts "MASTER [$master dbsize] keys, SLAVE [$slave dbsize] keys"} # catch {puts "MASTER [$master dbsize] keys, REPLICA [$slave dbsize] keys"}
if {($j % 20) == 0} { if {($j % 20) == 0} {
catch { catch {
@ -96,7 +96,7 @@ proc test_psync {descr duration backlog_size backlog_ttl delay cond diskless rec
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts -nonewline $fd $csv2 puts -nonewline $fd $csv2
close $fd close $fd
puts "Master - Slave inconsistency" puts "Master - Replica inconsistency"
puts "Run diff -u against /tmp/repldump*.txt for more info" puts "Run diff -u against /tmp/repldump*.txt for more info"
} }
assert_equal [r debug digest] [r -1 debug digest] assert_equal [r debug digest] [r -1 debug digest]

32
tests/integration/replication.tcl
View File

@ -32,7 +32,7 @@ start_server {tags {"repl"}} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[string match *handshake* [$slave role]] [string match *handshake* [$slave role]]
} else { } else {
fail "Slave does not enter handshake state" fail "Replica does not enter handshake state"
} }
} }
@ -45,7 +45,7 @@ start_server {tags {"repl"}} {
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[log_file_matches $slave_log "*Timeout connecting to the MASTER*"] [log_file_matches $slave_log "*Timeout connecting to the MASTER*"]
} else { } else {
fail "Slave is not able to detect timeout" fail "Replica is not able to detect timeout"
} }
} }
} }
@ -66,7 +66,7 @@ start_server {tags {"repl"}} {
[lindex [$A role] 0] eq {slave} && [lindex [$A role] 0] eq {slave} &&
[string match {*master_link_status:up*} [$A info replication]] [string match {*master_link_status:up*} [$A info replication]]
} else { } else {
fail "Can't turn the instance into a slave" fail "Can't turn the instance into a replica"
} }
} }
@ -77,7 +77,7 @@ start_server {tags {"repl"}} {
wait_for_condition 50 100 { wait_for_condition 50 100 {
[$A debug digest] eq [$B debug digest] [$A debug digest] eq [$B debug digest]
} else { } else {
fail "Master and slave have different digest: [$A debug digest] VS [$B debug digest]" fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
} }
} }
@ -102,10 +102,10 @@ start_server {tags {"repl"}} {
[lindex [$B role] 0] eq {slave} && [lindex [$B role] 0] eq {slave} &&
[string match {*master_link_status:up*} [$B info replication]] [string match {*master_link_status:up*} [$B info replication]]
} else { } else {
fail "Can't turn the instance into a slave" fail "Can't turn the instance into a replica"
} }
# Push elements into the "foo" list of the new slave. # Push elements into the "foo" list of the new replica.
# If the client is still attached to the instance, we'll get # If the client is still attached to the instance, we'll get
# a desync between the two instances. # a desync between the two instances.
$A rpush foo a b c $A rpush foo a b c
@ -116,7 +116,7 @@ start_server {tags {"repl"}} {
[$A lrange foo 0 -1] eq {a b c} && [$A lrange foo 0 -1] eq {a b c} &&
[$B lrange foo 0 -1] eq {a b c} [$B lrange foo 0 -1] eq {a b c}
} else { } else {
fail "Master and slave have different digest: [$A debug digest] VS [$B debug digest]" fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
} }
} }
} }
@ -135,7 +135,7 @@ start_server {tags {"repl"}} {
s master_link_status s master_link_status
} {down} } {down}
test {The role should immediately be changed to "slave"} { test {The role should immediately be changed to "replica"} {
s role s role
} {slave} } {slave}
@ -154,7 +154,7 @@ start_server {tags {"repl"}} {
wait_for_condition 500 100 { wait_for_condition 500 100 {
[r 0 get mykey] eq {bar} [r 0 get mykey] eq {bar}
} else { } else {
fail "SET on master did not propagated on slave" fail "SET on master did not propagated on replica"
} }
} }
@ -201,7 +201,7 @@ foreach dl {no yes} {
lappend slaves [srv 0 client] lappend slaves [srv 0 client]
start_server {} { start_server {} {
lappend slaves [srv 0 client] lappend slaves [srv 0 client]
test "Connect multiple slaves at the same time (issue #141), diskless=$dl" { test "Connect multiple replicas at the same time (issue #141), diskless=$dl" {
# Send SLAVEOF commands to slaves # Send SLAVEOF commands to slaves
[lindex $slaves 0] slaveof $master_host $master_port [lindex $slaves 0] slaveof $master_host $master_port
[lindex $slaves 1] slaveof $master_host $master_port [lindex $slaves 1] slaveof $master_host $master_port
@ -220,7 +220,7 @@ foreach dl {no yes} {
} }
} }
if {$retry == 0} { if {$retry == 0} {
error "assertion:Slaves not correctly synchronized" error "assertion:Replicas not correctly synchronized"
} }
# Wait that slaves acknowledge they are online so # Wait that slaves acknowledge they are online so
@ -231,7 +231,7 @@ foreach dl {no yes} {
[lindex [[lindex $slaves 1] role] 3] eq {connected} && [lindex [[lindex $slaves 1] role] 3] eq {connected} &&
[lindex [[lindex $slaves 2] role] 3] eq {connected} [lindex [[lindex $slaves 2] role] 3] eq {connected}
} else { } else {
fail "Slaves still not connected after some time" fail "Replicas still not connected after some time"
} }
# Stop the write load # Stop the write load
@ -248,7 +248,7 @@ foreach dl {no yes} {
[$master dbsize] == [[lindex $slaves 1] dbsize] && [$master dbsize] == [[lindex $slaves 1] dbsize] &&
[$master dbsize] == [[lindex $slaves 2] dbsize] [$master dbsize] == [[lindex $slaves 2] dbsize]
} else { } else {
fail "Different number of keys between masted and slave after too long time." fail "Different number of keys between masted and replica after too long time."
} }
# Check digests # Check digests
@ -273,7 +273,7 @@ start_server {tags {"repl"}} {
set master_port [srv 0 port] set master_port [srv 0 port]
set load_handle0 [start_write_load $master_host $master_port 3] set load_handle0 [start_write_load $master_host $master_port 3]
start_server {} { start_server {} {
test "Master stream is correctly processed while the slave has a script in -BUSY state" { test "Master stream is correctly processed while the replica has a script in -BUSY state" {
set slave [srv 0 client] set slave [srv 0 client]
puts [srv 0 port] puts [srv 0 port]
$slave config set lua-time-limit 500 $slave config set lua-time-limit 500
@ -283,7 +283,7 @@ start_server {tags {"repl"}} {
wait_for_condition 500 100 { wait_for_condition 500 100 {
[lindex [$slave role] 3] eq {connected} [lindex [$slave role] 3] eq {connected}
} else { } else {
fail "Slave still not connected after some time" fail "Replica still not connected after some time"
} }
# Wait some time to make sure the master is sending data # Wait some time to make sure the master is sending data
@ -305,7 +305,7 @@ start_server {tags {"repl"}} {
wait_for_condition 500 100 { wait_for_condition 500 100 {
[$master debug digest] eq [$slave debug digest] [$master debug digest] eq [$slave debug digest]
} else { } else {
fail "Different datasets between slave and master" fail "Different datasets between replica and master"
} }
} }
} }