From: Sage Weil <sage@redhat.com>
Date: Wed, 28 Feb 2018 23:12:42 +0000 (-0600)
Subject: log: allow stop() when not started
X-Git-Tag: v13.0.2~79^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3862d8849c014a4a863ebedc9719241ec9c2c46;p=ceph.git

log: allow stop() when not started

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/log/Log.cc b/src/log/Log.cc
index 70c698810608..8aedf3e4abde 100644
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -440,13 +440,14 @@ void Log::start()
 
 void Log::stop()
 {
-  assert(is_started());
-  pthread_mutex_lock(&m_queue_mutex);
-  m_stop = true;
-  pthread_cond_signal(&m_cond_flusher);
-  pthread_cond_broadcast(&m_cond_loggers);
-  pthread_mutex_unlock(&m_queue_mutex);
-  join();
+  if (is_started()) {
+    pthread_mutex_lock(&m_queue_mutex);
+    m_stop = true;
+    pthread_cond_signal(&m_cond_flusher);
+    pthread_cond_broadcast(&m_cond_loggers);
+    pthread_mutex_unlock(&m_queue_mutex);
+    join();
+  }
 }
 
 void *Log::entry()