]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: don't double-log ok-to-stop results
authorSage Weil <sage@newdream.net>
Fri, 19 Mar 2021 14:37:16 +0000 (10:37 -0400)
committerSage Weil <sage@newdream.net>
Sat, 20 Mar 2021 13:21:05 +0000 (08:21 -0500)
The calling upgrade code also reports this.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit df7af90b89359a0ef0df4eeeec00ce5758d2b738)

src/pybind/mgr/cephadm/services/cephadmservice.py

index 3e74d713e93962ddad2e4586473fc79f670abfbd..a8c5daf769caadbd412fa87d66ae7f10ca9608ed 100644 (file)
@@ -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]: