update sources to v12.2.0

[ceph.git] / ceph / src / common / LogClient.cc

diff --git a/ceph/src/common/LogClient.cc b/ceph/src/common/LogClient.cc
index 07c53e80d9ff7201c4af5b52381fc7cadef1e76d..aeb2f5bfcec82946ac7d1d600fb6668f90e30b67 100644 (file)
--- a/ceph/src/common/LogClient.cc
+++ b/ceph/src/common/LogClient.cc
@@ -224,11 +224,17 @@ void LogChannel::do_log(clog_type prio, const std::string& s)
   // seq and who should be set for syslog/graylog/log_to_mon
   e.who = parent->get_myinst();
   e.name = parent->get_myname();
-  e.seq = parent->get_next_seq();
   e.prio = prio;
   e.msg = s;
   e.channel = get_log_channel();
 
+  // log to monitor?
+  if (log_to_monitors) {
+    e.seq = parent->queue(e);
+  } else {
+    e.seq = parent->get_next_seq();
+  }
+
   // log to syslog?
   if (do_log_to_syslog()) {
     ldout(cct,0) << __func__ << " log to syslog"  << dendl;
@@ -240,11 +246,6 @@ void LogChannel::do_log(clog_type prio, const std::string& s)
     ldout(cct,0) << __func__ << " log to graylog"  << dendl;
     graylog->log_log_entry(&e);
   }
-
-  // log to monitor?
-  if (log_to_monitors) {
-    parent->queue(e);
-  }
 }
 
 Message *LogClient::get_mon_log_message(bool flush)
@@ -268,8 +269,8 @@ bool LogClient::are_pending()
 Message *LogClient::_get_mon_log_message()
 {
   assert(log_lock.is_locked());
-   if (log_queue.empty())
-     return NULL;
+  if (log_queue.empty())
+    return NULL;
 
   // only send entries that haven't been sent yet during this mon
   // session!  monclient needs to call reset_session() on mon session
@@ -324,6 +325,7 @@ void LogClient::_send_to_mon()
 version_t LogClient::queue(LogEntry &entry)
 {
   Mutex::Locker l(log_lock);
+  entry.seq = ++last_log;
   log_queue.push_back(entry);
 
   if (is_mon) {
@@ -335,6 +337,7 @@ version_t LogClient::queue(LogEntry &entry)
 
 uint64_t LogClient::get_next_seq()
 {
+  Mutex::Locker l(log_lock);
   return ++last_log;
 }