From: Zack Cerza Date: Thu, 5 Feb 2015 21:14:08 +0000 (-0700) Subject: Destroy VMs before unlocking, not after X-Git-Tag: 1.1.0~1014^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91d59805addf8a2860b938cdb28e353dfa263ae5;p=teuthology.git Destroy VMs before unlocking, not after Signed-off-by: Zack Cerza --- diff --git a/teuthology/lock.py b/teuthology/lock.py index 3ded5af84..e14977241 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -431,14 +431,14 @@ def unlock_one(ctx, name, user=None): if user is None: user = misc.get_user() name = misc.canonicalize_hostname(name, user=None) + if not provision.destroy_if_vm(ctx, name): + log.error('downburst destroy failed for %s', name) request = dict(name=name, locked=False, locked_by=user, description=None) uri = os.path.join(config.lock_server, 'nodes', name, 'lock', '') response = requests.put(uri, json.dumps(request)) success = response.ok if success: log.info('unlocked %s', name) - if not provision.destroy_if_vm(ctx, name): - log.error('downburst destroy failed for %s', name) else: try: reason = response.json().get('message')