From: Michael Fritch <mfritch@suse.com>
Date: Fri, 8 Nov 2019 00:13:18 +0000 (-0700)
Subject: ceph-daemon: unmount osd data dir during `adopt`
X-Git-Tag: v15.1.0~983^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31477%2Fhead;p=ceph.git

ceph-daemon: unmount osd data dir during `adopt`

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 99d38b36aeac..7159c51ac2dd 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -1412,6 +1412,8 @@ def command_adopt():
             logger.debug('Move \'%s\' -> \'%s\'' % (data_file, data_dir_dst))
             shutil.move(data_file, data_dir_dst)
         logger.debug('Remove dir \'%s\'' % (data_dir_src))
+        if os.path.ismount(data_dir_src):
+            call_throws(['umount', data_dir_src])
         os.rmdir(data_dir_src)
 
         # config