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

Use 'primary' instead of 'master' in Sentinel tcl testing. (#724)

Browse Source 
Use 'primary' instead of 'master' in Sentinel tcl testing.

---------

Signed-off-by: z00808363 <zhangtianlun2@huawei.com>
Co-authored-by: z00808363 <zhangtianlun2@huawei.com>
This commit is contained in:
AlanZhang1204 2024-07-03 22:41:27 +08:00 committed by GitHub
parent 8faf2788a2
commit b298dfd6ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/sentinel/tests/00-base.tcl
View File

@ -56,7 +56,7 @@ test "SENTINEL PENDING-SCRIPTS returns the information about pending scripts" {
assert_morethan_equal [llength [S 0 SENTINEL PENDING-SCRIPTS]] 0
}
test "SENTINEL MASTERS returns a list of monitored masters" {
test "SENTINEL PRIMARIES returns a list of monitored primaries" {
assert_match "*mymaster*" [S 0 SENTINEL MASTERS]
assert_morethan_equal [llength [S 0 SENTINEL MASTERS]] 1
}
@ -75,7 +75,7 @@ test "SENTINEL SIMULATE-FAILURE HELP list supported flags" {
assert_equal {crash-after-election crash-after-promotion} $res
}
test "Basic failover works if the master is down" {
test "Basic failover works if the primary is down" {
set old_port [RPort $master_id]
set addr [S 0 SENTINEL GET-MASTER-ADDR-BY-NAME mymaster]
assert {[lindex $addr 1] == $old_port}
@ -94,11 +94,11 @@ test "Basic failover works if the master is down" {
set master_id [get_instance_id_by_port valkey [lindex $addr 1]]
}
test "New master [join $addr {:}] role matches" {
test "New primary [join $addr {:}] role matches" {
assert {[RI $master_id role] eq {master}}
}
test "All the other slaves now point to the new master" {
test "All the other slaves now point to the new primary" {
foreach_valkey_id id {
if {$id != $master_id && $id != 0} {
wait_for_condition 1000 50 {
@ -110,7 +110,7 @@ test "All the other slaves now point to the new master" {
}
}
test "The old master eventually gets reconfigured as a slave" {
test "The old primary eventually gets reconfigured as a slave" {
wait_for_condition 1000 50 {
[RI 0 master_port] == [lindex $addr 1]
} else {
@ -190,12 +190,12 @@ test "Failover works if we configure for absolute agreement" {
}
}
test "New master [join $addr {:}] role matches" {
test "New primary [join $addr {:}] role matches" {
assert {[RI $master_id role] eq {master}}
}
test "SENTINEL RESET can resets the master" {
# After SENTINEL RESET, sometimes the sentinel can sense the master again,
test "SENTINEL RESET can resets the primary" {
# After SENTINEL RESET, sometimes the sentinel can sense the primary again,
# causing the test to fail. Here we give it a few more chances.
for {set j 0} {$j < 10} {incr j} {
assert_equal 1 [S 0 SENTINEL RESET mymaster]

2
tests/sentinel/tests/01-conf-update.tcl
View File

@ -34,7 +34,7 @@ test "After Sentinel 1 is restarted, its config gets updated" {
}
}
test "New master [join $addr {:}] role matches" {
test "New primary [join $addr {:}] role matches" {
assert {[RI $master_id role] eq {master}}
}

4
tests/sentinel/tests/02-slaves-reconf.tcl
View File

@ -9,7 +9,7 @@ source "../tests/includes/init-tests.tcl"
proc 02_test_slaves_replication {} {
uplevel 1 {
test "Check that slaves replicate from current master" {
test "Check that slaves replicate from current primary" {
set master_port [RPort $master_id]
foreach_valkey_id id {
if {$id == $master_id} continue
@ -27,7 +27,7 @@ proc 02_test_slaves_replication {} {
proc 02_crash_and_failover {} {
uplevel 1 {
test "Crash the master and force a failover" {
test "Crash the primary and force a failover" {
set old_port [RPort $master_id]
set addr [S 0 SENTINEL GET-MASTER-ADDR-BY-NAME mymaster]
assert {[lindex $addr 1] == $old_port}

8
tests/sentinel/tests/03-runtime-reconf.tcl
View File

@ -63,11 +63,11 @@ proc wait_for_sentinels_connect_servers { {is_connect 1} } {
}
}
test "Sentinels (re)connection following SENTINEL SET mymaster auth-pass" {
test "Sentinels (re)connection following SENTINEL SET myprimary auth-pass" {
# 3 types of sentinels to test:
# (re)started while master changed pwd. Manage to connect only after setting pwd
# (re)started while primary changed pwd. Manage to connect only after setting pwd
set sent2re 0
# (up)dated in advance with master new password
# (up)dated in advance with primary new password
set sent2up 1
# (un)touched. Yet manage to maintain (old) connection
set sent2un 2
@ -98,7 +98,7 @@ test "Sentinels (re)connection following SENTINEL SET mymaster auth-pass" {
verify_sentinel_auto_discovery
}
test "Sentinels (re)connection following master ACL change" {
test "Sentinels (re)connection following primary ACL change" {
# Three types of sentinels to test during ACL change:
# 1. (re)started Sentinel. Manage to connect only after setting new pwd
# 2. (up)dated Sentinel, get just before ACL change the new password

6
tests/sentinel/tests/05-manual.tcl
View File

@ -38,11 +38,11 @@ test "Manual failover works" {
set master_id [get_instance_id_by_port valkey [lindex $addr 1]]
}
test "New master [join $addr {:}] role matches" {
test "New primary [join $addr {:}] role matches" {
assert {[RI $master_id role] eq {master}}
}
test "All the other slaves now point to the new master" {
test "All the other slaves now point to the new primary" {
foreach_valkey_id id {
if {$id != $master_id && $id != 0} {
wait_for_condition 1000 50 {
@ -54,7 +54,7 @@ test "All the other slaves now point to the new master" {
}
}
test "The old master eventually gets reconfigured as a slave" {
test "The old primary eventually gets reconfigured as a slave" {
wait_for_condition 1000 50 {
[RI 0 master_port] == [lindex $addr 1]
} else {

2
tests/sentinel/tests/07-down-conditions.tcl
View File

@ -64,7 +64,7 @@ test "SDOWN is triggered by crashed instance" {
ensure_master_up
}
test "SDOWN is triggered by masters advertising as slaves" {
test "SDOWN is triggered by primaries advertising as slaves" {
ensure_master_up
R 0 slaveof 127.0.0.1 34567
ensure_master_down

8
tests/sentinel/tests/12-master-reboot.tcl
View File

@ -35,7 +35,7 @@ proc reboot_instance {type id} {
}
test "Master reboot in very short time" {
test "Primary reboot in very short time" {
set old_port [RPort $master_id]
set addr [S 0 SENTINEL GET-MASTER-ADDR-BY-NAME mymaster]
assert {[lindex $addr 1] == $old_port}
@ -78,11 +78,11 @@ test "Master reboot in very short time" {
}
}
test "New master [join $addr {:}] role matches" {
test "New primary [join $addr {:}] role matches" {
assert {[RI $master_id role] eq {master}}
}
test "All the other slaves now point to the new master" {
test "All the other slaves now point to the new primary" {
foreach_valkey_id id {
if {$id != $master_id && $id != 0} {
wait_for_condition 1000 50 {
@ -94,7 +94,7 @@ test "All the other slaves now point to the new master" {
}
}
test "The old master eventually gets reconfigured as a slave" {
test "The old primary eventually gets reconfigured as a slave" {
wait_for_condition 1000 50 {
[RI 0 master_port] == [lindex $addr 1]
} else {

8
tests/sentinel/tests/includes/init-tests.tcl
View File

@ -5,19 +5,19 @@ test "(init) Restart killed instances" {
restart_killed_instances
}
test "(init) Remove old master entry from sentinels" {
test "(init) Remove old primary entry from sentinels" {
foreach_sentinel_id id {
catch {S $id SENTINEL REMOVE mymaster}
}
}
set redis_slaves [expr $::instances_count - 1]
test "(init) Create a master-slaves cluster of [expr $redis_slaves+1] instances" {
test "(init) Create a primary-slaves cluster of [expr $redis_slaves+1] instances" {
create_valkey_master_slave_cluster [expr {$redis_slaves+1}]
}
set master_id 0
test "(init) Sentinels can start monitoring a master" {
test "(init) Sentinels can start monitoring a primary" {
set sentinels [llength $::sentinel_instances]
set quorum [expr {$sentinels/2+1}]
foreach_sentinel_id id {
@ -38,7 +38,7 @@ test "(init) Sentinels can start monitoring a master" {
}
}
test "(init) Sentinels can talk with the master" {
test "(init) Sentinels can talk with the primary" {
foreach_sentinel_id id {
wait_for_condition 1000 50 {
[catch {S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster}] == 0