d8f14df87c
This commit fixes sentinel announces hostnames test error in certain linux environment Before this commit, we only check localhost is resolved into 127.0.0.1, however in ubuntu or some other linux environments "localhost" will be resolved into ::1 ipv6 address first if the network stack is capable.
67 lines
1.9 KiB
Tcl
67 lines
1.9 KiB
Tcl
proc set_redis_announce_ip {addr} {
|
|
foreach_redis_id id {
|
|
R $id config set replica-announce-ip $addr
|
|
}
|
|
}
|
|
|
|
proc set_sentinel_config {keyword value} {
|
|
foreach_sentinel_id id {
|
|
S $id sentinel config set $keyword $value
|
|
}
|
|
}
|
|
|
|
proc set_all_instances_hostname {hostname} {
|
|
foreach_sentinel_id id {
|
|
set_instance_attrib sentinel $id host $hostname
|
|
}
|
|
foreach_redis_id id {
|
|
set_instance_attrib redis $id host $hostname
|
|
}
|
|
}
|
|
|
|
test "(pre-init) Configure instances and sentinel for hostname use" {
|
|
set ::host "localhost"
|
|
restart_killed_instances
|
|
set_all_instances_hostname $::host
|
|
set_redis_announce_ip $::host
|
|
set_sentinel_config resolve-hostnames yes
|
|
set_sentinel_config announce-hostnames yes
|
|
}
|
|
|
|
source "../tests/includes/init-tests.tcl"
|
|
|
|
proc verify_hostname_announced {hostname} {
|
|
foreach_sentinel_id id {
|
|
# Master is reported with its hostname
|
|
if {![string equal [lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 0] $hostname]} {
|
|
return 0
|
|
}
|
|
|
|
# Replicas are reported with their hostnames
|
|
foreach replica [S $id SENTINEL REPLICAS mymaster] {
|
|
if {![string equal [dict get $replica ip] $hostname]} {
|
|
return 0
|
|
}
|
|
}
|
|
}
|
|
return 1
|
|
}
|
|
|
|
test "Sentinel announces hostnames" {
|
|
# Check initial state
|
|
verify_hostname_announced $::host
|
|
|
|
# Disable announce-hostnames and confirm IPs are used
|
|
set_sentinel_config announce-hostnames no
|
|
assert {[verify_hostname_announced "127.0.0.1"] || [verify_hostname_announced "::1"]}
|
|
}
|
|
|
|
# We need to revert any special configuration because all tests currently
|
|
# share the same instances.
|
|
test "(post-cleanup) Configure instances and sentinel for IPs" {
|
|
set ::host "127.0.0.1"
|
|
set_all_instances_hostname $::host
|
|
set_redis_announce_ip $::host
|
|
set_sentinel_config resolve-hostnames no
|
|
set_sentinel_config announce-hostnames no
|
|
} |