Commit 491bcbaf authored by antirez's avatar antirez
Browse files

Sentinel test: restart_instance should refresh pid attrib.

Also kill_instance was modified to warn when a test will try to kill the
same instance multiple times for error.
parent 55643361
...@@ -280,6 +280,9 @@ proc get_instance_id_by_port {type port} { ...@@ -280,6 +280,9 @@ proc get_instance_id_by_port {type port} {
# The instance can be restarted with restart-instance. # The instance can be restarted with restart-instance.
proc kill_instance {type id} { proc kill_instance {type id} {
set pid [get_instance_attrib $type $id pid] set pid [get_instance_attrib $type $id pid]
if {$pid == -1} {
error "You tried to kill $type $id twice."
}
exec kill -9 $pid exec kill -9 $pid
set_instance_attrib $type $id pid -1 set_instance_attrib $type $id pid -1
set_instance_attrib $type $id link you_tried_to_talk_with_killed_instance set_instance_attrib $type $id link you_tried_to_talk_with_killed_instance
...@@ -302,6 +305,7 @@ proc restart_instance {type id} { ...@@ -302,6 +305,7 @@ proc restart_instance {type id} {
set prgname redis-sentinel set prgname redis-sentinel
} }
set pid [exec ../../src/${prgname} $cfgfile &] set pid [exec ../../src/${prgname} $cfgfile &]
set_instance_attrib $type $id pid $pid
lappend ::pids $pid lappend ::pids $pid
# Check that the instance is running # Check that the instance is running
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment