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 2fcaaa40 authored by Austin Clements's avatar Austin Clements

Whoops. Freeing a Plab node after an exec is ineffective. Fixed it

so the freeing first waits for the exec to finish in the other prong
of the fork.
parent 4da7262a
...@@ -277,6 +277,13 @@ foreach my $node (@nodes) { ...@@ -277,6 +277,13 @@ foreach my $node (@nodes) {
" Virtual node $node teardown failure!\n"); " Virtual node $node teardown failure!\n");
} }
} }
if ($plab && $killmode) {
if (system("$TB/sbin/plabnode -v -d free $pid $eid $node")) {
warn("*** $0:\n".
" Plab node free failed");
}
}
} }
else { else {
my $args = ($killmode ? "-k " : " "); my $args = ($killmode ? "-k " : " ");
...@@ -297,13 +304,6 @@ foreach my $node (@nodes) { ...@@ -297,13 +304,6 @@ foreach my $node (@nodes) {
exec("$ssh -host $node $CLIENT_BIN/vnodesetup $args"); exec("$ssh -host $node $CLIENT_BIN/vnodesetup $args");
die("*** $0:\n". die("*** $0:\n".
" exec failed!\n"); " exec failed!\n");
if ($plab && $killmode) {
if (system("$TB/sbin/plabnode -v -d free $pid $eid $node")) {
warn("*** $0:\n".
" Plab node free failed");
}
}
} }
} }
......
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