From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Jan 2020 22:14:21 +0000 (-0600)
Subject: mgr/cephadm: safe to restart mgr and other non-mon/osd/mds daemons
X-Git-Tag: v15.1.0~92^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0180d75a608ce0bd46b9e114923afa86f29ca6f;p=ceph.git

mgr/cephadm: safe to restart mgr and other non-mon/osd/mds daemons

We don't have "ok-to-stop" checks for these.  And the mgr check for
self/active is already in the caller.

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 31ba5b321b3b..870460b05bc9 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -404,6 +404,9 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                 self.log.info('Upgrade: safe to stop %s.%s' %
                               (s.service_type, s.service_instance))
                 return True
+        self.log.info('Upgrade: safe to stop %s.%s' %
+                      (s.service_type, s.service_instance))
+        return True
 
     def _clear_health_checks(self):
         self.health_checks = {}