diff options
| author | Madelyn Olson <34459052+madolson@users.noreply.github.com> | 2022-10-02 23:25:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 09:25:16 +0300 |
| commit | 663fbd34592aef3d24ac347ad00dbd02f3c7b713 (patch) | |
| tree | a31b9cf7ec239be605fa94d0104e7f39f668d676 /tests/support | |
| parent | a549b78c48121c698c84536d25404a23f01c167d (diff) | |
| download | redis-663fbd34592aef3d24ac347ad00dbd02f3c7b713.tar.gz | |
Stabilize cluster hostnames tests (#11307)
This PR introduces a couple of changes to improve cluster test stability:
1. Increase the cluster node timeout to 3 seconds, which is similar to the
normal cluster tests, but introduce a new mechanism to increase the ping
period so that the tests are still fast. This new config is a debug config.
2. Set `cluster-replica-no-failover yes` on a wider array of tests which are
sensitive to failovers. This was occurring on the ARM CI.
Diffstat (limited to 'tests/support')
| -rw-r--r-- | tests/support/cluster_helper.tcl | 2 | ||||
| -rw-r--r-- | tests/support/server.tcl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/support/cluster_helper.tcl b/tests/support/cluster_helper.tcl index 6d70e44c1..644eefdae 100644 --- a/tests/support/cluster_helper.tcl +++ b/tests/support/cluster_helper.tcl @@ -103,7 +103,7 @@ proc start_cluster {masters replicas options code {slot_allocator continuous_slo # Configure the starting of multiple servers. Set cluster node timeout # aggressively since many tests depend on ping/pong messages. - set cluster_options [list overrides [list cluster-enabled yes cluster-node-timeout 500]] + set cluster_options [list overrides [list cluster-enabled yes cluster-ping-interval 100 cluster-node-timeout 3000]] set options [concat $cluster_options $options] # Cluster mode only supports a single database, so before executing the tests diff --git a/tests/support/server.tcl b/tests/support/server.tcl index 6cc846b97..a23224bd7 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -418,7 +418,7 @@ proc start_server {options {code undefined}} { set baseconfig $value } "overrides" { - set overrides $value + set overrides [concat $overrides $value] } "config_lines" { set config_lines $value |