]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
log: buffer log entries until flusher thread starts
authorSage Weil <sage@redhat.com>
Fri, 22 Mar 2019 15:56:45 +0000 (10:56 -0500)
committerSage Weil <sage@redhat.com>
Fri, 29 Mar 2019 23:19:20 +0000 (18:19 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4af24e57aafd8774da4b1d2c7e3b17dcae1c18a0)

src/log/Log.cc

index 8d74dcabc04e54cd64ed45053c831be9c6dbbd3a..9ecde2887ea39cf50f2c401faaae7cc1591d0e63 100644 (file)
@@ -184,7 +184,8 @@ void Log::submit_entry(Entry&& e)
     *(volatile int *)(0) = 0xdead;
 
   // wait for flush to catch up
-  while (m_new.size() > m_max_new) {
+  while (is_started() &&
+        m_new.size() > m_max_new) {
     if (m_stop) break; // force addition
     m_cond_loggers.wait(lock);
   }