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

Do not croak if manager pid file exists but no manager process exists,

parent 1ccc8414
......@@ -252,7 +252,9 @@ if ($killit || $haltit) {
}
if ($rebootit) {
if ($doplab || -e $pidfile) {
exit(rebootvnode());
my $rval = rebootvnode();
exit($rval)
if ($rval <= 0);
}
# if vnode isn't already running, just try to (re)start it
}
......@@ -676,6 +678,11 @@ sub rebootvnode() {
}
}
elsif (kill('USR2', $mpid) == 0) {
if ($!{ESRCH}) {
unlink($pidfile);
# Tell caller there is no process, and just start one.
return 1;
}
if ($debug) {
print"*** Could not kill(USR2) process $mpid: $!\n";
}
......
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