diff options
| author | Sage Weil <sage@inktank.com> | 2013-01-02 13:58:44 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-01-02 17:01:32 -0800 |
| commit | 43cba617aa0247d714632bddf31b9271ef3a1b50 (patch) | |
| tree | 42c30523d5aa72f9313131464eeeaf1f59e76c74 | |
| parent | d8940d15c330d05c8a198ff7dde16df748938b65 (diff) | |
| download | ceph-43cba617aa0247d714632bddf31b9271ef3a1b50.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>
| -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 2912463f6b6..e06afbfe1e2 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -252,7 +252,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; |