From f1b814e5151b259acf280080d45fefbb2f45c1f6 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Fri, 19 Sep 2014 17:32:51 +0100 Subject: [PATCH] mon: Monitor: log RO admin socket commands on 'debug' level Reduces the noise caused by read-only operations via the admin socket. RW commands are still logged at 'info' level. Fixes: #9455 Signed-off-by: Joao Eduardo Luis --- src/mon/Monitor.cc | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 0a535ef7decb0..9683c128b0dce 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -279,11 +279,15 @@ void Monitor::do_admin_command(string command, cmdmap_t& cmdmap, string format, args += cmd_vartype_stringify(p->second); } args = "[" + args + "]"; + + bool read_only = false; + if (command == "mon_status" || command == "quorum_status") { + read_only = true; + } - audit_clog->info() << "from='admin socket' " - << "entity='admin socket' " - << "cmd=" << command << " " - << "args=" << args << ": dispatch"; + (read_only ? audit_clog->debug() : audit_clog->info()) + << "from='admin socket' entity='admin socket' " + << "cmd='" << command << "' args=" << args << ": dispatch"; if (command == "mon_status") { get_mon_status(f.get(), ss); @@ -318,17 +322,19 @@ void Monitor::do_admin_command(string command, cmdmap_t& cmdmap, string format, } else { assert(0 == "bad AdminSocket command binding"); } - audit_clog->info() << "from='admin socket' " - << "entity='admin socket' " - << "cmd=" << command << " " - << "args=" << args << ": finished"; + (read_only ? audit_clog->debug() : audit_clog->info()) + << "from='admin socket' " + << "entity='admin socket' " + << "cmd=" << command << " " + << "args=" << args << ": finished"; return; abort: - audit_clog->info() << "from='admin socket' " - << "entity='admin socket' " - << "cmd=" << command << " " - << "args=" << args << ": aborted"; + (read_only ? audit_clog->debug() : audit_clog->info()) + << "from='admin socket' " + << "entity='admin socket' " + << "cmd=" << command << " " + << "args=" << args << ": aborted"; } void Monitor::handle_signal(int signum) -- 2.39.5