ceph-disk: do not stop activate-all on first failure

Keep going even if we hit one activation error.  This avoids failing to
start some disks when only one of them won't start (e.g., because it
doesn't belong to the current cluster).

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit c9074375bfbe1e3757b9c423a5ff60e8013afbce)

diff --git a/src/ceph-disk b/src/ceph-disk
index cd3b6cce3d5dbede360342419fd643cdf3cfaf20..26097c8e0897371950ec8d4f54c7473df30c0a5e 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1694,6 +1694,7 @@ def main_activate_all(args):
     LOG.debug('Scanning %s', dir)
     if not os.path.exists(dir):
         return
+    err = False
     for name in os.listdir(dir):
         if name.find('.') < 0:
             continue
@@ -1713,11 +1714,17 @@ def main_activate_all(args):
                     osd_id=osd_id,
                     )
 
-            except:
-                raise
+            except Exception as e:
+                print >> sys.stderr, '{prog}: {msg}'.format(
+                    prog=args.prog,
+                    msg=e,
+                    )
+                err = True
 
             finally:
                 activate_lock.release()
+    if err:
+        raise Error('One or more partitions failed to activate')
 
 
 ###########################