From: Sage Weil <sage@inktank.com>
Date: Thu, 27 Jun 2013 01:27:49 +0000 (-0700)
Subject: ceph-disk: do not mount over an osd directly in /var/lib/ceph/osd/$cluster-$id
X-Git-Tag: v0.66~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a17f33b14d858235dfeaa42be1f4842dcfd66d2;p=ceph.git

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 <sage@inktank.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 392af4a78b74..0c1ffb965af6 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1476,8 +1476,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)