]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Don't explode on ConnectionError in list_locks()
authorZack Cerza <zack.cerza@inktank.com>
Wed, 27 Aug 2014 20:01:16 +0000 (14:01 -0600)
committerZack Cerza <zack.cerza@inktank.com>
Wed, 27 Aug 2014 20:01:16 +0000 (14:01 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/lock.py

index 29a8b9b853fcf0a3a3d523b77c5409578e2d3376..1bf97f01cb506e8101bfaafeb5e4b94810c43058 100644 (file)
@@ -337,8 +337,12 @@ def list_locks(keyed_by_name=False, **kwargs):
         if 'machine_type' in kwargs:
             kwargs['machine_type'] = kwargs['machine_type'].replace(',','|')
         uri += '?' + urllib.urlencode(kwargs)
-    response = requests.get(uri)
-    success = response.ok
+    try:
+        response = requests.get(uri)
+    except requests.ConnectionError:
+        success = False
+    else:
+        success = response.ok
     if success:
         if not keyed_by_name:
             return response.json()