From 0b72c8dbd28a72455e91ac9d8a75b6787957549e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Mar 2013 16:46:48 -0700 Subject: [PATCH] lock: pass desc to lock operation; leave on unlock Pass the desc to the lock operation. The unlock operation now clears desc for us; no need to do it outselves. Signed-off-by: Sage Weil --- teuthology/lock.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index 33776f7d18e23..b63260ceae534 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -28,14 +28,15 @@ def lock_many(ctx, num, machinetype, user=None, description=None): if user is None: user = teuthology.get_user() success, content, status = send_request('POST', _lock_url(ctx), - urllib.urlencode(dict(user=user, num=num, machinetype=machinetype))) + urllib.urlencode(dict( + user=user, + num=num, + machinetype=machinetype, + desc=description, + ))) if success: machines = json.loads(content) log.debug('locked {machines}'.format(machines=', '.join(machines.keys()))) - if description is not None: - log.debug('Setting locked machine descriptions to %s', description) - for m in machines.keys(): - update_lock(ctx, m, description) return machines if status == 503: log.error('Insufficient nodes available to lock %d nodes.', num) @@ -57,13 +58,10 @@ def lock(ctx, name, user=None): def unlock(ctx, name, user=None): if user is None: user = teuthology.get_user() - desc_success = update_lock(ctx, name, description='') success, _ , _ = send_request('DELETE', _lock_url(ctx) + '/' + name + '?' + \ urllib.urlencode(dict(user=user))) if success: log.debug('unlocked %s', name) - if not desc_success: - log.warn('failed to remove description for %s', name) else: log.error('failed to unlock %s', name) return success -- 2.39.5