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

Minor fix. Tweak for Mike.

parent c91a0de1
......@@ -1390,6 +1390,8 @@ foreach my $pnode (keys(%virtnodes)) {
# know there are enough, since assign knows that.
#
my $num = @vlist;
print "Asking avail for $num vnodes on $pnode\n";
open(AVAIL,"$TBROOT/sbin/avail virtonly=$pnode rand limit=$num |")
or fatal(1, "*** $0:\n".
......@@ -1400,9 +1402,14 @@ foreach my $pnode (keys(%virtnodes)) {
if (! /^\|/);
next
if (/node_id/);
my ($nodeid) = /^\|([-a-zA-Z0-9]+)\s*\|(\w+)\s*\|(\w+)\s*\|$/;
push(@plist, $nodeid);
if ($_ =~ /^\|([-a-zA-Z0-9]+)\s*\|(\w+)\s*\|(\w+)\s*\|$/) {
push(@plist, $1);
}
else {
fatal(1, "*** $0:\n".
" Bad line from avail: $_\n");
}
}
close(AVAIL);
......@@ -1415,7 +1422,7 @@ foreach my $pnode (keys(%virtnodes)) {
# Try to allocate. Note, if this fails we are done for. Okay for now
# since it is never the case that it should fail!
#
print "Reserving @plist ...\n";
print "Reserving ($pnode) @plist ...\n";
if (system("nalloc $pid $eid @plist")) {
fatal(1, "*** $0:\n".
"Failed to reserve @plist (on $pnode)\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