caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix failing cluster tests (#9695)

Browse Source 
When stopping an instance in the cluster tests, disable appendonly first, so that SIGTERM won't be ignored.

Recently in #9679 i change the test infra to use SIGSEGV to kill servers that refuse
the SIGTERM rather than do SIGKILL directly.

This surfaced an issue that i've added in #7725 which changed SIGKILL to SIGTERM (to resolve valgrind issues).
So the current situation in the past months was that sometimes servers refused the
SIGTERM and waited 10 seconds for the SIGKILL, and this commit resolves that (faster termination).
This commit is contained in:
Oran Agra 2021-10-28 12:16:27 +03:00 committed by GitHub
parent b7afac6bc2
commit 22a778c880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/instances.tcl
View File

@ -583,7 +583,7 @@ proc get_instance_id_by_port {type port} {
fail "Instance $type port $port not found."
}
# Kill an instance of the specified type/id with SIGKILL.
# Kill an instance of the specified type/id with SIGTERM.
# This function will mark the instance PID as -1 to remember that this instance
# is no longer running and will remove its PID from the list of pids that
# we kill at cleanup.
@ -597,6 +597,9 @@ proc kill_instance {type id} {
error "You tried to kill $type $id twice."
}
# stop appendonly so that the instance won't refuse to go down
R $id config set appendonly no
stop_instance $pid
set_instance_attrib $type $id pid -1
set_instance_attrib $type $id link you_tried_to_talk_with_killed_instance