From: Sage Weil <sage@redhat.com>
Date: Wed, 2 Oct 2019 20:54:24 +0000 (-0500)
Subject: ceph-daemon: make rm-cluster clean up system-ceph*.slice too
X-Git-Tag: v15.1.0~1313^2~26
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=104f9b689d7e279ff3b2dd483a76078a2d08fe63;p=ceph-ci.git

ceph-daemon: make rm-cluster clean up system-ceph*.slice too

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 6310a2f13fc..49355f8a101 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -875,22 +875,33 @@ def command_rm_cluster():
     if not args.force:
         raise RuntimeError('must pass --force to proceed: '
                            'this command may destroy precious data!')
+
     unit_name = 'ceph-%s.target' % args.fsid
     try:
         subprocess.check_output(['systemctl', 'stop', unit_name])
         subprocess.check_output(['systemctl', 'disable', unit_name])
     except subprocess.CalledProcessError:
         pass
-    # FIXME: disable individual daemon units, too?
+
+    slice_name = 'system-%s.slice' % (
+        ('ceph-%s' % args.fsid).replace('-', '\\x2d'))
+    try:
+        subprocess.check_output(['systemctl', 'stop', slice_name])
+    except subprocess.CalledProcessError:
+        pass
+
+    # FIXME: stop + disable individual daemon units, too?
+
+    # rm units
     subprocess.check_output(['rm', '-f', args.unit_dir +
                              '/ceph-%s@.service' % args.fsid])
     subprocess.check_output(['rm', '-f', args.unit_dir +
                              '/ceph-%s.target' % args.fsid])
     subprocess.check_output(['rm', '-rf',
                   args.unit_dir + '/ceph-%s.target.wants' % args.fsid])
-    # data
+    # rm data
     subprocess.check_output(['rm', '-rf', args.data_dir + '/' + args.fsid])
-    # logs
+    # rm logs
     subprocess.check_output(['rm', '-rf', args.log_dir + '/' + args.fsid])
     subprocess.check_output(['rm', '-rf', args.log_dir +
                              '/*.wants/ceph-%s@*' % args.fsid])