From 7e018e9c4b57ce5dc54283685dbbc920318915b1 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 6 Nov 2019 07:56:39 -0700 Subject: [PATCH] ceph-daemon: Remove data dir during adopt Signed-off-by: Michael Fritch --- src/ceph-daemon | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index c77f0554de3..cc878015aaa 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -1401,12 +1401,14 @@ def command_adopt(): # data logger.info('Moving data...') - data_dir_src = ('/var/lib/ceph/%s/%s-%s/*' % + data_dir_src = ('/var/lib/ceph/%s/%s-%s' % (daemon_type, args.cluster, daemon_id)) data_dir_dst = make_data_dir(fsid, daemon_type, daemon_id) - for data_file in glob(data_dir_src): + for data_file in glob(os.path.join(data_dir_src, '*')): 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)) + os.rmdir(data_dir_src) # config config_src = '/etc/ceph/%s.conf' % (args.cluster) -- 2.39.5