Commit e6075372 authored by Kirk Webb's avatar Kirk Webb

Fix a couple of small bugs now that I can test things..

parent 0c8edab9
......@@ -4,6 +4,7 @@ import sys
import os
import time
import signal
import traceback
import xmlrpclib
#
......
......@@ -77,8 +77,7 @@ HTTP_PATH = "/" # ensure this ends in a slash
ROOTBALL_HTTP_URLPATH = HTTPD_SITE + HTTPD_PORT + HTTP_PATH
DEF_ROOTBALL_NAME = "@PLAB_ROOTBALL@"
#SLICEPREFIX = "@PLAB_SLICEPREFIX@"
SLICEPREFIX = "utah"
SLICEPREFIX = "@PLAB_SLICEPREFIX@"
#
# var to track failed renewals
......@@ -544,7 +543,7 @@ class Slice:
if res:
DBQueryFatal("insert into plab_slices"
" (pid, eid, slicename, slicemeta) "
" values (%s, %s, %s, %s, %s)",
" values (%s, %s, %s, %s)",
(self.pid, self.eid, self.slicename,
self.slicemeta))
pass
......@@ -682,7 +681,7 @@ class Node:
DBQueryFatal("replace into plab_slice_nodes"
" (pid, eid, slicename, node_id,"
" nodemeta, leaseend)"
" values (%s, %s, %s, %s, %s, %s, %s)",
" values (%s, %s, %s, %s, %s, %s)",
(self.slice.pid, self.slice.eid,
self.slice.slicename, self.nodeid,
self.nodemeta, self.leaselen))
......
......@@ -4,6 +4,7 @@ import sys
import os
import time
import signal
import traceback
import xmlrpclib
#
......
......@@ -27,7 +27,12 @@ def main(args):
usage(me)
except ValueError:
usage(me)
pass
if not len(args):
usage(me)
pass
command = args[0]
opts, args = getopt.getopt(args[1:], "f")
for o, a in opts:
......@@ -58,7 +63,7 @@ def main(args):
else:
print "Giving up after %s setup attempts on %s" % \
(TRIES, nodeid)
#XXX node.free()
node.free()
raise
elif command == "renew":
......
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