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

Fix failing cluster tests. (#8763)

Browse Source 
Disable replica migration to avoid a race condition where the
migrated-from node turns into a replica.

Long term, this test should probably be improved to handle multiple
slots and accept such auto migrations but this is a quick fix to
stabilize the CI without completely dropping this test.
This commit is contained in:
Yossi Gottlieb 2021-04-13 00:00:57 +03:00 committed by GitHub
parent a0e19e3cf1
commit 5e3a15ae1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cluster/tests/20-half-migrated-slot.tcl
View File

@ -9,6 +9,7 @@ source "../tests/includes/utils.tcl"
test "Create a 2 nodes cluster" { test "Create a 2 nodes cluster" {
create_cluster 2 0 create_cluster 2 0
config_set_all_nodes cluster-allow-replica-migration no
} }
test "Cluster is up" { test "Cluster is up" {
@ -87,3 +88,5 @@ test "Half-finish importing" {
fix_cluster $nodefrom(addr) fix_cluster $nodefrom(addr)
assert_equal "xyz" [$cluster get aga] assert_equal "xyz" [$cluster get aga]
} }
config_set_all_nodes cluster-allow-replica-migration yes

2
tests/cluster/tests/21-many-slot-migration.tcl
View File

@ -9,6 +9,7 @@ source "../tests/includes/utils.tcl"
test "Create a 10 nodes cluster" { test "Create a 10 nodes cluster" {
create_cluster 10 0 create_cluster 10 0
config_set_all_nodes cluster-allow-replica-migration no
} }
test "Cluster is up" { test "Cluster is up" {
@ -54,3 +55,4 @@ test "Keys are accessible" {
} }
} }
config_set_all_nodes cluster-allow-replica-migration yes

6
tests/cluster/tests/includes/utils.tcl
View File

@ -1,5 +1,11 @@
source "../../../tests/support/cli.tcl" source "../../../tests/support/cli.tcl"
proc config_set_all_nodes {keyword value} {
foreach_redis_id id {
R $id config set $keyword $value
}
}
proc fix_cluster {addr} { proc fix_cluster {addr} {
set code [catch { set code [catch {
exec ../../../src/redis-cli {*}[rediscli_tls_config "../../../tests"] --cluster fix $addr << yes exec ../../../src/redis-cli {*}[rediscli_tls_config "../../../tests"] --cluster fix $addr << yes