From: Redouane Kachach <rkachach@redhat.com>
Date: Mon, 18 Apr 2022 13:42:39 +0000 (+0200)
Subject: mgr/cephadm: fixing logging output for rm-cluster operation
X-Git-Tag: v17.2.1~73^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08ba06ff4bd97f02d293a1ea24d3b3fb79ac7471;p=ceph.git

mgr/cephadm: fixing logging output for rm-cluster operation
Fixes: https://tracker.ceph.com/issues/51671

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 9756e3bf8ce6976d12245e1e6724838b03d70135)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index fd7cd562a3a2..71dccb7babc5 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -281,10 +281,10 @@ class ExcludeErrorsFilter(logging.Filter):
         return record.levelno < logging.WARNING
 
 
-# During bootstrap operation we use:
+# When cephadm is used as standard binary (bootstrap, rm-cluster, etc) we use:
 # stdout: for debug and info
 # stderr: for errors and warnings
-bootstrap_logging_config = {
+interactive_logging_config = {
     'version': 1,
     'filters': {
         'exclude_errors': {
@@ -8879,8 +8879,9 @@ def cephadm_init_logging(ctx: CephadmContext, args: List[str]) -> None:
     global logger
     if not os.path.exists(LOG_DIR):
         os.makedirs(LOG_DIR)
-    if 'bootstrap' in args:
-        dictConfig(bootstrap_logging_config)
+    operations = ['bootstrap', 'rm-cluster']
+    if any(op in args for op in operations):
+        dictConfig(interactive_logging_config)
     else:
         dictConfig(logging_config)