]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix debug build of OpsLogFile 43740/head
authorCasey Bodley <cbodley@redhat.com>
Sun, 31 Oct 2021 00:26:21 +0000 (20:26 -0400)
committerCory Snyder <csnyder@iland.com>
Mon, 1 Nov 2021 15:15:52 +0000 (15:15 +0000)
can't use ceph::mutex locks with std::condition_variable::wait() in
debug builds. use the ceph::condition_variable wrapper instead

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_log.h

index c1cc5badad1088ff4ca4578ae97afffab32d2b82..90131889da4e6e95b775267188ba5d8a90838fa6 100644 (file)
@@ -162,7 +162,7 @@ class OpsLogFile : public JsonOpsLogSink, public Thread, public DoutPrefixProvid
   ceph::mutex flush_mutex = ceph::make_mutex("OpsLogFile_flush");
   std::vector<bufferlist> log_buffer;
   std::vector<bufferlist> flush_buffer;
-  std::condition_variable cond_flush;
+  ceph::condition_variable cond_flush;
   std::ofstream file;
   bool stopped;
   uint64_t data_size;