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.67.6~1^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d60e952f3c00d0e551b04c0d6486b11d9761be35;p=ceph.git

ceph-disk: do not hide main_activate() exceptions

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 55ca7bb2da73f1be1293710a635cfea42abd7682)
---

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