From 08ba06ff4bd97f02d293a1ea24d3b3fb79ac7471 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 18 Apr 2022 15:42:39 +0200 Subject: [PATCH] mgr/cephadm: fixing logging output for rm-cluster operation Fixes: https://tracker.ceph.com/issues/51671 Signed-off-by: Redouane Kachach (cherry picked from commit 9756e3bf8ce6976d12245e1e6724838b03d70135) --- src/cephadm/cephadm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index fd7cd562a3a29..71dccb7babc54 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) -- 2.39.5