From: Sage Weil Date: Fri, 19 Mar 2021 14:37:16 +0000 (-0400) Subject: mgr/cephadm: don't double-log ok-to-stop results X-Git-Tag: v16.2.0~73^2~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e2ccc461bf8fb77baf7cdd604a9d224ef9741d6;p=ceph.git mgr/cephadm: don't double-log ok-to-stop results The calling upgrade code also reports this. Signed-off-by: Sage Weil (cherry picked from commit df7af90b89359a0ef0df4eeeec00ce5758d2b738) --- diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 3e74d713e939..a8c5daf769ca 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -301,7 +301,7 @@ class CephadmService(metaclass=ABCMeta): err = f'It is NOT safe to stop {",".join(names)} at this time' if self.TYPE not in ['mon', 'osd', 'mds']: - logger.info(out) + logger.debug(out) return HandleCommandResult(0, out) if self.TYPE == 'osd': @@ -314,11 +314,11 @@ class CephadmService(metaclass=ABCMeta): if r.retval: err = f'{err}: {r.stderr}' if r.stderr else err - logger.error(err) + logger.debug(err) return HandleCommandResult(r.retval, r.stdout, err) out = f'{out}: {r.stdout}' if r.stdout else out - logger.info(out) + logger.debug(out) return HandleCommandResult(r.retval, out, r.stderr) def _enough_daemons_to_stop(self, daemon_type: str, daemon_ids: List[str], service: str, low_limit: int, alert: bool = False) -> Tuple[bool, str]: