]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: remove noop try:
authorLoic Dachary <loic@dachary.org>
Mon, 30 Dec 2013 16:09:35 +0000 (17:09 +0100)
committerAlfredo Deza <alfredo@deza.pe>
Wed, 12 Feb 2014 21:17:11 +0000 (16:17 -0500)
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit de0050596b5f56863c3486c1cd5e7ffea62e3d00)

src/ceph-disk

index 8b9c5c62e9310413be048177404bb921cf077314..4edf842af4a7e923c8c864df6d8d85071b4fe0f3 100755 (executable)
@@ -1722,7 +1722,6 @@ def activate(
     init,
     ):
 
-    try:
         check_osd_magic(path)
 
         ceph_fsid = read_one_line(path, 'ceph_fsid')
@@ -1801,9 +1800,6 @@ def activate(
             write_one_line(path, 'active', 'ok')
         LOG.debug('%s osd.%s data dir is ready at %s', cluster, osd_id, path)
         return (osd_id, cluster)
-    except:
-        raise
-
 
 
 def main_activate(args):