Commit 21f627fa authored by Kirk Webb's avatar Kirk Webb
Browse files

Add a bit of additional output info, and fix a little bug in rc.inplab
parent 9c1e9abb
......@@ -321,7 +321,6 @@ class mod_PLCNM:
tryXmlrpcCmd(agent.SliceDelete, OKstrs = ["does not exist"])
pass
# XXX: copied code - not correct for PLC/NM hybrid
def renewSlice(self, slice, force = False):
agent = self.__getAgent(slice.slicename)
ret = 0
......@@ -421,8 +420,8 @@ class mod_PLCNM:
if vers[0] != MAJOR_VERS or vers[1] != MINOR_VERS \
or vers[2] < MIN_REV:
raise RuntimeError, \
"Remote node manager version incompatible: " + \
".".join(map(lambda x: str(x), vers))
"Remote node manager version incompatible on %s: %s" % \
(node.nodeid, ".".join(map(lambda x: str(x), vers)))
pass
try:
......
......@@ -425,8 +425,10 @@ while (1) {
#
# Kill of the oldest if he gets too old while we're waiting
#
local $SIG{ALRM} = sub { kill("TERM", $oldestpid); };
local $SIG{ALRM} = sub { print "*** $0: timeout waiting for vnode:\n";
kill("TERM", $oldestpid); };
if ($waittime <= 0) {
print "*** $0: timeout waiting for vnode:\n";
kill("TERM",$oldestpid);
} else {
alarm($waittime);
......
......@@ -133,7 +133,7 @@ sub doboot()
#
# Create the /local/logs directory if necessary
#
if (! -e "/local") {
if (! -e "/local/logs") {
my @tmccresults = ();
if (tmcc(TMCCCMD_CREATOR, undef, \@tmccresults) < 0) {
fatal("Unable to lookup experiment creator!\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