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 288e7bb9 authored by Leigh B Stoller's avatar Leigh B Stoller

Do not send XMLRPC to terminate a terminated sliver.

parent 3a668bcb
......@@ -732,6 +732,9 @@ sub DoTerminate()
my $urn = $sliver->aggregate_urn();
my $errmsg;
return 0
if ($sliver->status() eq "terminated");
my $response = $sliver->Terminate();
if (!defined($response)) {
$errmsg = "RPC Error calling Terminate";
......@@ -748,11 +751,14 @@ sub DoTerminate()
$errmsg = "Could not delete slice: ". $response->output();
goto bad;
}
$instance->SetStatus("terminated");
return 0;
bad:
print STDERR "$urn: $errmsg\n";
return -1;
};
print STDERR Dumper($instance);
my @return_codes = ();
my @agglist = $instance->AggregateList();
if (ParRun({"maxwaittime" => 99999,
......
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