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 99d38b36aeacbf9895241dfaad36a7706d9c3c2b..7159c51ac2ddce13228fecb09904bbe4d9626dfb 100755 (executable)
--- 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