Commit edde5522 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Two minor fixes:

1. For multi-architecture, being fixed to a specific node is the same as
   being fixed to a specific type.

2. Watch for return value from nalloc, where -1 becomes 255. Hate that.
parent cfef42e6
#!/usr/bin/perl -w
#
# Copyright (c) 2005-2016 University of Utah and the Flux Group.
# Copyright (c) 2005-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -1295,7 +1295,7 @@ sub LoadVirtNodes($)
# then we selected the first real type from the list. Might not be
# what we want to do.
#
if (!$vnode->_typeinfo()->IsClass()) {
if (!$vnode->_typeinfo()->IsClass() || defined($fixed)) {
if (!defined($self->types()->{$type})) {
$self->types()->{$type} = 0;
}
......@@ -5373,7 +5373,7 @@ sub AllocNodes($)
#
# If nalloc failed with a fatal error, lets give it up. No retry.
#
if ($exitval < 0) {
if ($exitval < 0 || $exitval == 255) {
tberror("Failed to reserve any nodes.\n");
return -1;
}
......
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