From 79041e03f301bee02f6ed04a0eb20c47a9f0430f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 31 Oct 2019 13:42:56 -0500 Subject: [PATCH] ceph-daemon: make rm-daemon reset-failed We did this with rm-cluster and forgot to update rm-daemon too. Also, switch to call instead of call_throws. Signed-off-by: Sage Weil --- src/ceph-daemon | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index 62f678e3ca3f..0aa57bb7f126 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -1411,8 +1411,12 @@ def command_rm_daemon(): raise RuntimeError('must pass --force to proceed: ' 'this command may destroy precious data!') unit_name = get_unit_name(args.fsid, daemon_type, daemon_id) - call_throws(['systemctl', 'stop', unit_name]) - call_throws(['systemctl', 'disable', unit_name]) + call(['systemctl', 'stop', unit_name], + verbose_on_failure=False) + call(['systemctl', 'reset-failed', unit_name], + verbose_on_failure=False) + call(['systemctl', 'disable', unit_name], + verbose_on_failure=False) data_dir = get_data_dir(args.fsid, daemon_type, daemon_id) call_throws(['rm', '-rf', data_dir]) -- 2.47.3