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.77~54^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=908348b8047e8577ecf9133f2683f91423694416;p=ceph.git

ceph-disk: make exception handling terse in main_activate_journal

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

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