From 26e7a6fffde4abcb685f34247e8491c05ee2a68d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 Jun 2013 18:27:49 -0700 Subject: [PATCH] ceph-disk: do not mount over an osd directly in /var/lib/ceph/osd/$cluster-$id If we see a 'ready' file in the target OSD dir, do not mount our device on top of it. Among other things, this prevents ceph-disk activate on stray disks from stepping on teuthology osds. Fixes: #5445 Signed-off-by: Sage Weil (cherry picked from commit 8a17f33b14d858235dfeaa42be1f4842dcfd66d2) --- src/ceph-disk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ceph-disk b/src/ceph-disk index 93864c1c00859..f13ab88d8dfe2 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -1454,8 +1454,15 @@ def mount_activate( parent_dev = os.stat('/var/lib/ceph/osd').st_dev if dst_dev != parent_dev: other = True + else if os.listdir('/var/lib/ceph/osd/{cluster}-{osd_id}'.format( + cluster=cluster, + osd_id=osd_id, + )): + other = True + except OSError: pass + if active: LOG.info('%s osd.%s already mounted in position; unmounting ours.' % (cluster, osd_id)) unmount(path) -- 2.39.5