Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 22:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix supervisor "destroy" call on nodes not currently alive

Browse source 
This would mistakenly have the Stem process kill itself due to giving
PID 0 as argument to kill() where it really was being used to mean "that
node does not currently have any live process associated with it" and so
can just be removed without trying to kill/reap.
This commit is contained in:
Jon Siwek 2020-01-22 13:17:38 -08:00
parent 59e075acab
commit 68b513a364
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/supervisor/Supervisor.cc
View file

@ -458,6 +458,13 @@ void Stem::Reap()
bool Stem::Wait(Supervisor::Node* node, int options) const bool Stem::Wait(Supervisor::Node* node, int options) const
{ {
if ( node->pid <= 0 )
{
DBG_STEM("Stem skip waiting for node '%s' (PID %d) to terminate: already dead",
node->Name().data(), node->pid);
return true;
}
int status; int status;
auto res = waitpid(node->pid, &status, options); auto res = waitpid(node->pid, &status, options);
@ -502,6 +509,13 @@ bool Stem::Wait(Supervisor::Node* node, int options) const
void Stem::KillNode(Supervisor::Node* node, int signal) const void Stem::KillNode(Supervisor::Node* node, int signal) const
{ {
if ( node->pid <= 0 )
{
DBG_STEM("Stem skip killing node '%s' (PID %d): already dead",
node->Name().data(), node->pid);
return;
}
node->killed = true; node->killed = true;
auto kill_res = kill(node->pid, signal); auto kill_res = kill(node->pid, signal);
@ -516,6 +530,13 @@ void Stem::Destroy(Supervisor::Node* node) const
constexpr auto kill_delay = 2; constexpr auto kill_delay = 2;
auto kill_attempts = 0; auto kill_attempts = 0;
if ( node->pid <= 0 )
{
DBG_STEM("Stem skip killing/waiting node '%s' (PID %d): already dead",
node->Name().data(), node->pid);
return;
}
for ( ; ; ) for ( ; ; )
{ {
auto sig = kill_attempts++ < max_term_attempts ? SIGTERM : SIGKILL; auto sig = kill_attempts++ < max_term_attempts ? SIGTERM : SIGKILL;
@ -626,6 +647,7 @@ void Stem::KillNodes(int signal)
void Stem::Shutdown(int exit_code) void Stem::Shutdown(int exit_code)
{ {
DBG_STEM("Stem shutting down with exit code %d", exit_code);
shutting_down = true; shutting_down = true;
constexpr auto max_term_attempts = 13; constexpr auto max_term_attempts = 13;
constexpr auto kill_delay = 2; constexpr auto kill_delay = 2;
@ -830,9 +852,8 @@ std::optional<Supervisor::SupervisedNode> Stem::Poll()
else if ( cmd == "destroy" ) else if ( cmd == "destroy" )
{ {
auto it = nodes.find(node_name); auto it = nodes.find(node_name);
assert(it != nodes.end());
auto& node = it->second; auto& node = it->second;
DBG_STEM("Stem destroying node: %s", node_name.data()); DBG_STEM("Stem destroying node: %s (PID %d)", node_name.data(), node.pid);
Destroy(&node); Destroy(&node);
nodes.erase(it); nodes.erase(it);
} }
@ -841,7 +862,7 @@ std::optional<Supervisor::SupervisedNode> Stem::Poll()
auto it = nodes.find(node_name); auto it = nodes.find(node_name);
assert(it != nodes.end()); assert(it != nodes.end());
auto& node = it->second; auto& node = it->second;
DBG_STEM("Stem restarting node: %s", node_name.data()); DBG_STEM("Stem restarting node: %s (PID %d)", node_name.data(), node.pid);
Destroy(&node); Destroy(&node);
auto sn = Spawn(&node); auto sn = Spawn(&node);