diff options
| author | Sage Weil <sage@inktank.com> | 2013-01-02 13:58:44 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-01-03 09:23:40 -0800 |
| commit | f8bb4814d0fd7e08c9b6cdcde02940bf1b42cadd (patch) | |
| tree | a9d370a02917865ca725273d9daa2c51bc19c00a | |
| parent | 9483a032f750572586f146c696ec6501d3df0383 (diff) | |
| download | ceph-f8bb4814d0fd7e08c9b6cdcde02940bf1b42cadd.tar.gz | |
log: fix locking typo/stupid for dump_recent()
We weren't locking m_flush_mutex properly, which in turn was leading to
racing threads calling dump_recent() and garbling the crash dump output.
Backport: bobtail, argonaut
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 43cba617aa0247d714632bddf31b9271ef3a1b50)
| -rw-r--r-- | src/log/Log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/log/Log.cc b/src/log/Log.cc index f3f5e19366e..55c831d66fd 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -250,7 +250,7 @@ void Log::_log_message(const char *s, bool crash) void Log::dump_recent() { - pthread_mutex_unlock(&m_flush_mutex); + pthread_mutex_lock(&m_flush_mutex); pthread_mutex_lock(&m_queue_mutex); EntryQueue t; |