summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRishabh Dave <ridave@redhat.com>2024-07-17 14:35:33 +0200
committerRishabh Dave <ridave@redhat.com>2024-10-19 13:25:59 +0200
commite830f89240e382fdf5da676437ff783c4ea6ae42 (patch)
treec75c8e1dde476b2f5e6f71c66be7603a4f4dbd5d
parentMerge pull request #60323 from aclamk/wip-aclamk-fix-68528 (diff)
downloadceph-e830f89240e382fdf5da676437ff783c4ea6ae42.tar.xz
ceph-e830f89240e382fdf5da676437ff783c4ea6ae42.zip
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>
-rw-r--r--src/mgr/PyModuleRegistry.cc2
-rw-r--r--src/mon/MgrMonitor.cc8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc
index 0eb304e7353..736e49b375f 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 c235d9e6219..1960f8a2c0b 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