Commit 8905ab2e authored by Leigh B Stoller's avatar Leigh B Stoller

Minor change to previous revision.

parent f20a9bf0
......@@ -166,7 +166,13 @@ sub KillInstances()
print STDERR "No such instance $uuid\n";
next;
}
print STDERR "$instance is in the $status state\n";
print "$instance is in the $status state\n";
print "$instance has its canceled flag set\n"
if ($instance->canceled());
if ($instance->canceled() && $status eq "ready") {
print "Ignoring canceled flag since instance is ready\n";
next;
}
#
# Try to terminate the instance. We cannot take the lock since
......@@ -633,7 +639,8 @@ sub KillStaleDatasets()
}
if ($oneshot) {
UpdateAggregateGraphs();
KillInstances();
KillStaleDatasets();
exit(0);
}
......@@ -657,6 +664,7 @@ while (1) {
POSIX::strftime("20%y-%m-%d %H:%M:%S", localtime()) . "\n";
KillInstances();
KillStaleDatasets();
FixFailedImaging();
ExpireInstances();
if ($MAINSITE) {
......
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