From c9074375bfbe1e3757b9c423a5ff60e8013afbce Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 15 Jun 2013 20:06:33 -0700 Subject: [PATCH] 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 --- src/ceph-disk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ceph-disk b/src/ceph-disk index cd3b6cce3d5db..26097c8e08973 100755 --- 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') ########################### -- 2.39.5