From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 16:13:47 +0000 (+0100)
Subject: ceph-disk: do not hide main_activate() exceptions
X-Git-Tag: v0.77~54^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55ca7bb2da73f1be1293710a635cfea42abd7682;p=ceph.git

ceph-disk: do not hide main_activate() exceptions

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index e6e91bcda333..a18929914909 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1832,9 +1832,8 @@ def main_activate(args):
             cluster=cluster,
             osd_id=osd_id,
             )
-        activate_lock.release()
 
-    except:
+    finally:
         activate_lock.release()