From: Warren Usui <warren.usui@inktank.com>
Date: Wed, 14 Aug 2013 00:16:00 +0000 (-0700)
Subject: Display error message when locking a vpm fails due to downburst errors.
X-Git-Tag: 1.1.0~1978^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4681b35016619ece44730a368070220e6c2e56a3;p=teuthology.git

Display error message when locking a vpm fails due to downburst errors.
When doing a lock-many, do not lock any of the vpms when downburst errors
occur.   Do not display message on unlock with downburst error, because
slot is still freed (and can be locked by someone else).

Fix: 5957
Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index e98444e7..79f88d8c 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -29,8 +29,13 @@ def lock_many(ctx, num, machinetype, user=None, description=None):
         machines = json.loads(content)
         log.debug('locked {machines}'.format(machines=', '.join(machines.keys())))
         if ctx.machine_type == 'vps':
+            ok_machs = {}
             for machine in machines:
-                create_if_vm(ctx, machine)
+                if create_if_vm(ctx, machine):
+                    ok_machs[machine] = machines[machine]
+                else:
+                    unlock(ctx, machine)
+            return ok_machs
         return machines
     if status == 503:
         log.error('Insufficient nodes available to lock %d nodes.', num)
@@ -57,7 +62,7 @@ def unlock(ctx, name, user=None):
     if success:
         log.debug('unlocked %s', name)
         if not destroy_if_vm(ctx, name):
-            log.error('downburst destroy failed for %s',name)
+            log.info('downburst destroy failed for %s',name)
     else:
         log.error('failed to unlock %s', name)
     return success
@@ -378,6 +383,11 @@ Lock, unlock, or query lock status of machines.
             if ctx.machine_type == 'vps':
                 shortnames = ' '.join([name.split('@')[1].split('.')[0] for name in result.keys()])
                 print "Successfully Locked:\n%s\n" % shortnames
+                if len(result) < ctx.num_to_lock:
+                    print "Error: Locking failed."
+                    for machn in result:
+                        unlock(ctx,machn)
+                    return 1 
                 print "Unable to display keys at this time (virtual machines are booting)."
                 print "Please run teuthology-lock --list-targets %s once these machines come up." % shortnames
             else:
@@ -596,7 +606,7 @@ def create_if_vm(ctx, machine_name):
         metadata = "--meta-data=%s" % tmp.name
         dbrst = _get_downburst_exec()
         if not dbrst:
-            log.info("Error: no downburst executable found")
+            log.error("No downburst executable found.")
             return False
         p = subprocess.Popen([dbrst, '-c', phys_host,
                 'create', metadata, createMe],