]> git.apps.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)
committerLoic Dachary <loic@dachary.org>
Fri, 3 Jan 2014 15:30:40 +0000 (16:30 +0100)
Signed-off-by: Loic Dachary <loic@dachary.org>
src/ceph-disk

index 4f367e3e67ee27c5702f1a805bcddf807f7a6e39..a0c20c75110a7e3792bcdae266af3e8c487affdd 100755 (executable)
@@ -1719,7 +1719,6 @@ def activate(
     init,
     ):
 
-    try:
         check_osd_magic(path)
 
         ceph_fsid = read_one_line(path, 'ceph_fsid')
@@ -1798,9 +1797,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):