From 3e8b5d588e64f9090bcbaa33adc903c0e7a8659d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 28 Feb 2018 17:12:42 -0600 Subject: [PATCH] log: allow stop() when not started Signed-off-by: Sage Weil (cherry picked from commit f3862d8849c014a4a863ebedc9719241ec9c2c46) --- src/log/Log.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/log/Log.cc b/src/log/Log.cc index 6af49b4c8cd56..5f7e23b4b048c 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -433,13 +433,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() -- 2.39.5