All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 95762aea authored by Leigh B Stoller's avatar Leigh B Stoller

More minor changes.

parent 4e97124c
......@@ -8429,7 +8429,7 @@ sub KillMonitor($)
{
my ($slice) = @_;
return $slice->KillMonitor();
return $slice->CancelMonitor();
}
#
......
......@@ -1659,7 +1659,7 @@ sub GetPortalURL($)
sub CheckMonitor($)
{
my ($slice) = @_;
my $pid = $slice->monitor_pid();
my $pid = $slice->GetMonitorPid();
#
# See if the process still exists.
......@@ -1675,12 +1675,12 @@ sub CheckMonitor($)
}
#
# Kill the monitor process.
# Cancel the slice monitor process.
#
sub KillMonitor($)
sub CancelMonitor($)
{
my ($slice) = @_;
my $pid = $slice->monitor_pid();
my $pid = $slice->GetMonitorPid();
require libtestbed;
return 0
......@@ -1698,6 +1698,7 @@ sub KillMonitor($)
if (kill(0, $pid) == 0) {
if ($!{ESRCH}) {
print STDERR "Monitor process $pid no longer exists.\n";
$experiment->SetCancelFlag(0);
$slice->ClearMonitorPid();
return 0;
}
......@@ -1741,7 +1742,6 @@ sub KillMonitor($)
"$TBBASE/showslice.php?slice_idx=" . $slice->idx() .
"&showtype=cm",
$TBOPS);
print STDERR "Could not shutdown $slice!\n";
return GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Monitor would not die");
}
......
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