Commit fb3d560a authored by Leigh B Stoller's avatar Leigh B Stoller

Make sure we reload the node object in ComputeStatus() so we do not miss

a transition. Also, call HasStartupAgent() to see if we have a program
agents with onexpstart=true; we count these as startup "execute"
services.
parent 9ab73ede
...@@ -1398,6 +1398,8 @@ sub ComputeStatus($;$) ...@@ -1398,6 +1398,8 @@ sub ComputeStatus($;$)
print STDERR "$node was already released from $self\n"; print STDERR "$node was already released from $self\n";
return -1; return -1;
} }
# Make sure our object has the updated state.
$node->GetEventState();
# #
# Special state for updating user accounts. We never go into the # Special state for updating user accounts. We never go into the
...@@ -1581,7 +1583,8 @@ sub GenerateStatusBlob($) ...@@ -1581,7 +1583,8 @@ sub GenerateStatusBlob($)
# Startup command info. # Startup command info.
# #
if (defined($node) && if (defined($node) &&
defined($node->startupcmd()) && $node->startupcmd() ne "") { ((defined($node->startupcmd()) && $node->startupcmd() ne "") ||
$node->HasStartupAgent())) {
if (defined($node->startstatus()) && if (defined($node->startstatus()) &&
$node->startstatus() ne "none") { $node->startstatus() ne "none") {
$blob->{'execute_state'} = "exited"; $blob->{'execute_state'} = "exited";
......
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