]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
lock: remove description when unlocking
authorJosh Durgin <josh.durgin@inktank.com>
Thu, 7 Mar 2013 17:40:25 +0000 (09:40 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Thu, 7 Mar 2013 17:40:29 +0000 (09:40 -0800)
This will hopefully make it easier to track down what's leaving nodes unlocked.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
teuthology/lock.py

index d1148ab07184cf8f6a81305e3e008d01169e17ec..3c092f6a7a4f12d87b2759addcb4624a03086460 100644 (file)
@@ -57,10 +57,13 @@ 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