From 451c824619ff414d325e8189e56b8ed75983c5ff Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 Sep 2019 14:30:52 -0500 Subject: [PATCH] ceph-daemon: long lines Signed-off-by: Sage Weil --- src/ceph-daemon | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index 1f8c1e8c519..848f9304f4a 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -605,7 +605,8 @@ def command_ls(): def command_rm_daemon(): (daemon_type, daemon_id) = args.name.split('.') if daemon_type in ['mon', 'osd'] and not args.force: - raise RuntimeError('must pass --force to proceed: this command may destroy precious data!') + raise RuntimeError('must pass --force to proceed: ' + 'this command may destroy precious data!') unit_name = get_unit_name(args.fsid, daemon_type, daemon_id) subprocess.check_output(['systemctl', 'stop', unit_name]) subprocess.check_output(['systemctl', 'disable', unit_name]) @@ -616,22 +617,28 @@ def command_rm_daemon(): def command_rm_cluster(): if not args.force: - raise RuntimeError('must pass --force to proceed: this command may destroy precious data!') + 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 - 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]) + # FIXME: disable individual daemon units, too? + 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 subprocess.check_output(['rm', '-rf', args.data_dir + '/' + args.fsid]) + # logs subprocess.check_output(['rm', '-rf', args.log_dir + '/' + args.fsid]) - subprocess.check_output(['rm', '-rf', args.log_dir + '/*.wants/ceph-%s@*' % args.fsid]) + subprocess.check_output(['rm', '-rf', args.log_dir + + '/*.wants/ceph-%s@*' % args.fsid]) - # FIXME: disable individual daemon units, too ################################## -- 2.39.5