]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Monitor: log RO admin socket commands on 'debug' level
authorJoao Eduardo Luis <joao@redhat.com>
Fri, 19 Sep 2014 16:32:51 +0000 (17:32 +0100)
committerJoao Eduardo Luis <joao@redhat.com>
Mon, 22 Sep 2014 16:36:29 +0000 (17:36 +0100)
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 <joao@redhat.com>
src/mon/Monitor.cc

index 0a535ef7decb009d44675e5b39b5e041a5eea9c4..9683c128b0dcea3720e94646e10483c34be983bd 100644 (file)
@@ -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)