From e23ed6df5c39251878b944c3f8f8aa9d9f18111d Mon Sep 17 00:00:00 2001
From: Michael Fritch <mfritch@suse.com>
Date: Thu, 7 Nov 2019 17:13:18 -0700
Subject: [PATCH] ceph-daemon: unmount osd data dir during `adopt`

Signed-off-by: Michael Fritch <mfritch@suse.com>
---
 src/ceph-daemon | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 99d38b36aea..7159c51ac2d 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
-- 
2.39.5