From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 17 Jul 2024 12:35:33 +0000 (+0530)
Subject: mon/MgrMonitor: improve a log message
X-Git-Tag: v20.0.0~782^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e830f89240e382fdf5da676437ff783c4ea6ae42;p=ceph.git

mon/MgrMonitor: improve a log message

Following log message has 3 distinct information (enabled modules,
modules that are alwats on and total number of commands enabled) printed
on the same line which makes it hard to find one of the information and
also makes it comparatively hard to read -

2024-07-17T17:21:16.609+0530 7f534ae006c0  0 mon.a@0(leader).mgr e0 create_initial initial modules iostat,nfs,volumes, always on modules balancer,crash,devicehealth,orchestrator,pg_autoscaler,progress,status,telemetry, 50 commands

With this commit it would be easier to read and find needed info -

2024-07-17T17:21:16.609+0530 7f534ae006c0  0 mon.a@0(leader).mgr e0 create_initial initial modules: iostat,nfs,volumes
2024-07-17T17:21:16.609+0530 7f534ae006c0  0 mon.a@0(leader).mgr e0 create_initial always on modules: balancer,crash,devicehealth,orchestrator,pg_autoscaler,progress,status,telemetry
2024-07-17T17:21:16.609+0530 7f534ae006c0  0 mon.a@0(leader).mgr e0 create_initial 50 commands

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc
index 0eb304e735381..736e49b375f80 100644
--- a/src/mgr/PyModuleRegistry.cc
+++ b/src/mgr/PyModuleRegistry.cc
@@ -243,7 +243,7 @@ void PyModuleRegistry::active_start(
       continue;
     }
 
-    dout(4) << "Starting " << i.first << dendl;
+    dout(4) << "Starting module '" << i.first << "'" << dendl;
     active_modules->start_one(i.second);
   }
 }
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index c235d9e6219e9..1960f8a2c0bf0 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -146,10 +146,12 @@ void MgrMonitor::create_initial()
   }
   pending_map.always_on_modules = always_on_modules();
   pending_command_descs = mgr_commands;
-  dout(10) << __func__ << " initial modules " << pending_map.modules
-	   << ", always on modules " << pending_map.get_always_on_modules()
-           << ", " << pending_command_descs.size() << " commands"
+  dout(10) << __func__ << " initial enabled modules: " << pending_map.modules
 	   << dendl;
+  dout(10) << __func__ << "always on modules: " <<
+	     pending_map.get_always_on_modules() << dendl;
+  dout(10) << __func__ << "total " << pending_command_descs.size() <<
+	      " commands" << dendl;
 }
 
 void MgrMonitor::get_store_prefixes(std::set<string>& s) const