From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jan 2020 23:37:56 +0000 (-0600)
Subject: Merge PR #32754 into master
X-Git-Tag: v15.1.0~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55b1f74d6d090a51806de1a07b9375282cb57f29;p=ceph.git

Merge PR #32754 into master

* refs/pull/32754/head:
	mgr/cephadm: health alert for stray hosts and/or services

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

55b1f74d6d090a51806de1a07b9375282cb57f29
diff --cc src/pybind/mgr/cephadm/module.py
index d64701b71bd,6f46d1d877c..73731ea153d
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -404,12 -418,11 +418,14 @@@ class CephadmOrchestrator(MgrModule, or
                  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 = {}
+     def _clear_upgrade_health_checks(self):
+         for k in ['UPGRADE_NO_STANDBY_MGR']:
+             if k in self.health_checks:
+                 del self.health_checks[k]
          self.set_health_checks(self.health_checks)
  
      def _do_upgrade(self, daemons):