mirrors/valkey
1
0
Fork 0
mirror of http://github.com/valkey-io/valkey synced 2024-11-22 09:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix new cluster tests issues (#9657)

Browse Source 
Following #9483 the daily CI exposed a few problems.

* The cluster creation code (uses redis-cli) is complicated to test with TLS enabled.
  for now i'm just skipping them since the tests we run there don't really need that kind of coverage
* cluster port binding failures
  note that `find_available_port` already looks for a free cluster port
  but the code in `wait_server_started` couldn't detect the failure of binding
  (the text it greps for wasn't found in the log)
This commit is contained in:
Oran Agra 2021-10-20 15:40:28 +03:00 committed by GitHub
parent 43e736f79b
commit 7d6744c739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster.c
View File

@ -584,6 +584,8 @@ void clusterInit(void) {
} }
int cport = server.cluster_port ? server.cluster_port : port + CLUSTER_PORT_INCR; int cport = server.cluster_port ? server.cluster_port : port + CLUSTER_PORT_INCR;
if (listenToPort(cport, &server.cfd) == C_ERR ) { if (listenToPort(cport, &server.cfd) == C_ERR ) {
/* Note: the following log text is matched by the test suite. */
serverLog(LL_WARNING, "Failed listening on port %u (cluster), aborting.", cport);
exit(1); exit(1);
} }

2
src/server.c
View File

@ -4199,11 +4199,13 @@ void initServer(void) {
/* Open the TCP listening socket for the user commands. */ /* Open the TCP listening socket for the user commands. */
if (server.port != 0 && if (server.port != 0 &&
listenToPort(server.port,&server.ipfd) == C_ERR) { listenToPort(server.port,&server.ipfd) == C_ERR) {
/* Note: the following log text is matched by the test suite. */
serverLog(LL_WARNING, "Failed listening on port %u (TCP), aborting.", server.port); serverLog(LL_WARNING, "Failed listening on port %u (TCP), aborting.", server.port);
exit(1); exit(1);
} }
if (server.tls_port != 0 && if (server.tls_port != 0 &&
listenToPort(server.tls_port,&server.tlsfd) == C_ERR) { listenToPort(server.tls_port,&server.tlsfd) == C_ERR) {
/* Note: the following log text is matched by the test suite. */
serverLog(LL_WARNING, "Failed listening on port %u (TLS), aborting.", server.tls_port); serverLog(LL_WARNING, "Failed listening on port %u (TLS), aborting.", server.tls_port);
exit(1); exit(1);
} }

12
tests/unit/cluster.tcl
View File

@ -21,10 +21,14 @@ proc csi {args} {
# make sure the test infra won't use SELECT # make sure the test infra won't use SELECT
set ::singledb 1 set ::singledb 1
# cluster creation is complicated with TLS, and the current tests don't really need that coverage
tags {tls:skip external:skip cluster} {
# start three servers # start three servers
start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"external:skip cluster"}} { set base_conf [list cluster-enabled yes cluster-node-timeout 1]
start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"external:skip cluster"}} { start_server [list overrides $base_conf] {
start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"external:skip cluster"}} { start_server [list overrides $base_conf] {
start_server [list overrides $base_conf] {
set node1 [srv 0 client] set node1 [srv 0 client]
set node2 [srv -1 client] set node2 [srv -1 client]
@ -149,3 +153,5 @@ start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"exte
} }
} }
} }
} ;# tags

17
tests/unit/moduleapi/cluster.tcl
View File

@ -24,20 +24,21 @@ set testmodule_nokey [file normalize tests/modules/blockonbackground.so]
# make sure the test infra won't use SELECT # make sure the test infra won't use SELECT
set ::singledb 1 set ::singledb 1
# cluster creation is complicated with TLS, and the current tests don't really need that coverage
tags {tls:skip external:skip cluster modules} {
# start three servers # start three servers
start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"external:skip cluster modules"}} { set base_conf [list cluster-enabled yes cluster-node-timeout 1 loadmodule $testmodule]
start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"external:skip cluster modules"}} { start_server [list overrides $base_conf] {
start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"external:skip cluster modules"}} { start_server [list overrides $base_conf] {
start_server [list overrides $base_conf] {
set node1 [srv 0 client] set node1 [srv 0 client]
set node2 [srv -1 client] set node2 [srv -1 client]
set node3 [srv -2 client] set node3 [srv -2 client]
set node3_pid [srv -2 pid] set node3_pid [srv -2 pid]
$node1 module load $testmodule # the "overrides" mechanism can only support one "loadmodule" directive
$node2 module load $testmodule
$node3 module load $testmodule
$node1 module load $testmodule_nokey $node1 module load $testmodule_nokey
$node2 module load $testmodule_nokey $node2 module load $testmodule_nokey
$node3 module load $testmodule_nokey $node3 module load $testmodule_nokey
@ -200,3 +201,5 @@ start_server {overrides {cluster-enabled yes cluster-node-timeout 1} tags {"exte
} }
} }
} }
} ;# tags