From: Sebastian Wagner Date: Wed, 27 Jan 2021 11:57:07 +0000 (+0100) Subject: Merge pull request #38854 from adk3798/ots-monitoring X-Git-Tag: v17.1.0~3154 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84b78520eab9d2f028b97296fa61fb9bb1988775;p=ceph.git Merge pull request #38854 from adk3798/ots-monitoring mgr/cephadm: force flag for ok-to-stop and ok-to-stop for monitoring stack Reviewed-by: Juan Miguel Olmo Martínez Reviewed-by: Kefu Chai Reviewed-by: Michael Fritch Reviewed-by: Sebastian Wagner --- 84b78520eab9d2f028b97296fa61fb9bb1988775 diff --cc src/pybind/mgr/cephadm/module.py index 2e88dafe6751,06a5a06efd32..a6ffdb4a037b --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@@ -1333,15 -1346,16 +1349,16 @@@ class CephadmOrchestrator(orchestrator. if host_daemons: # daemons on this host, so check the daemons can be stopped # and if so, place the host into maintenance by disabling the target - rc, msg = self._host_ok_to_stop(hostname) + rc, msg = self._host_ok_to_stop(hostname, force) if rc: - raise OrchestratorError(msg, errno=rc) + raise OrchestratorError( + msg + '\nNote: Warnings can be bypassed with the --force flag', errno=rc) # call the host-maintenance function - out, _err, _code = CephadmServe(self)._run_cephadm(hostname, cephadmNoImage, "host-maintenance", - ["enter"], - error_ok=True) - if out: + _out, _err, _code = CephadmServe(self)._run_cephadm(hostname, cephadmNoImage, "host-maintenance", + ["enter"], + error_ok=True) + if _out: raise OrchestratorError( f"Failed to place {hostname} into maintenance for cluster {self._cluster_fsid}")