From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Feb 2020 22:08:00 +0000 (-0600)
Subject: cephadm: reset-failed on reconfig
X-Git-Tag: v15.1.1~330^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=328e430329e61943892aacf8fe93ecfbc09454fa;p=ceph.git

cephadm: reset-failed on reconfig

Sometimes we had a bad config that reconfig will fix, so we need to
reset-failed before restart.  If there was not failure this is harmless.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 47628f2b83e..59c7df807ff 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1259,6 +1259,8 @@ def deploy_daemon(fsid, daemon_type, daemon_id, c, uid, gid,
     if reconfig and daemon_type not in Ceph.daemons:
         # ceph daemons do not need a restart; others (presumably) do to pick
         # up the new config
+        call_throws(['systemctl', 'reset-failed',
+                     get_unit_name(fsid, daemon_type, daemon_id)])
         call_throws(['systemctl', 'restart',
                      get_unit_name(fsid, daemon_type, daemon_id)])