Ignore node not found error

This ignores errors if the machine can't be found in the database. This is to ease the transition to nodepool. Change-Id: I3f3a1b8804e48f5a8643971f003246aca413a866
openstack-archive · Aug 15, 2013 · 339b3da · 339b3da
1 parent 12571b2
commit 339b3da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/devstack-vm-delete.py b/devstack-vm-delete.py
@@ -38,7 +38,12 @@
 def main():
     db = vmdatabase.VMDatabase()
 
-    machine = db.getMachineByJenkinsName(NODE_NAME)
+    try:
+        machine = db.getMachineByJenkinsName(NODE_NAME)
+    except Exception:
+        utils.log.debug("Unable to find node: %s" % NODE_NAME)
+        return
+
     if machine.state != vmdatabase.HOLD:
         utils.log.debug("Set deleted ID: %s old state: %s build: %s" % (
                 machine.id, machine.state, BUILD_URL))

diff --git a/devstack-vm-inprogress.py b/devstack-vm-inprogress.py
@@ -51,7 +51,12 @@ def main():
     else:
         jenkins = None
 
-    machine = db.getMachineByJenkinsName(NODE_NAME)
+    try:
+        machine = db.getMachineByJenkinsName(NODE_NAME)
+    except Exception:
+        utils.log.debug("Unable to find node: %s" % NODE_NAME)
+        return
+
     utils.log.debug("Used ID: %s old state: %s build:%s" % (
             machine.id, machine.state, BUILD_URL))