From: Sage Weil <sage@redhat.com>
Date: Fri, 4 Aug 2017 21:18:17 +0000 (-0400)
Subject: common/LogClient: make last_log non-atomic
X-Git-Tag: v12.2.0~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17197%2Fhead;p=ceph.git

common/LogClient: make last_log non-atomic

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c36a98be97e15294f57c6a640fe6a1c277dce8a3)
---

diff --git a/src/common/LogClient.cc b/src/common/LogClient.cc
index 84ceec8705216..aeb2f5bfcec82 100644
--- a/src/common/LogClient.cc
+++ b/src/common/LogClient.cc
@@ -337,6 +337,7 @@ version_t LogClient::queue(LogEntry &entry)
 
 uint64_t LogClient::get_next_seq()
 {
+  Mutex::Locker l(log_lock);
   return ++last_log;
 }
 
diff --git a/src/common/LogClient.h b/src/common/LogClient.h
index 56bb91ba9934c..be70e4512837b 100644
--- a/src/common/LogClient.h
+++ b/src/common/LogClient.h
@@ -245,7 +245,7 @@ private:
   bool is_mon;
   Mutex log_lock;
   version_t last_log_sent;
-  std::atomic<uint64_t> last_log;
+  version_t last_log;
   std::deque<LogEntry> log_queue;
 
   std::map<std::string, LogChannelRef> channels;