From 4c0151367ee33ee2fb22ac273bbb24ad3264e2de Mon Sep 17 00:00:00 2001 From: Warren Usui Date: Mon, 14 Apr 2014 17:04:52 -0700 Subject: [PATCH] Improve unlock error messages. Added messages if the hostname is invalid, and if the user is not the owner of the lock. Fixes: 6295 Signed-off-by: Warren Usui --- teuthology/lock.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index 589dfabfb2..42aa01d93f 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -73,7 +73,7 @@ def lock_one(ctx, name, user=None, description=None): def unlock_one(ctx, name, user=None): if user is None: user = misc.get_user() - success, _, _ = ls.send_request( + success, _, http_ret = ls.send_request( 'DELETE', config.lock_server + '/' + name + '?' + urllib.urlencode(dict(user=user))) @@ -84,6 +84,10 @@ def unlock_one(ctx, name, user=None): log.info('%s is not locked' % name) else: log.error('failed to unlock %s', name) + failure_types = {403: 'You do not have %s locked', + 404: '%s is an invalid host name'} + if http_ret in failure_types: + log.error(failure_types[http_ret], name) return success -- 2.39.5