From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 16:15:29 +0000 (+0100)
Subject: ceph-disk: make exception handling terse in main_activate_journal
X-Git-Tag: v0.67.6~1^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccf182241dc04c79e2377b6ba2f060dbfe6dddae;p=ceph.git

ceph-disk: make exception handling terse in main_activate_journal

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

diff --git a/src/ceph-disk b/src/ceph-disk
index b2e183e1721..900464163a7 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1893,12 +1893,9 @@ def main_activate_journal(args):
             osd_id=osd_id,
             )
 
+    finally:
         activate_lock.release()
 
-    except:
-        activate_lock.release()
-        raise
-
 ###########################
 
 def main_activate_all(args):