]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
log: fix locking typo/stupid for dump_recent()
authorSage Weil <sage@inktank.com>
Wed, 2 Jan 2013 21:58:44 +0000 (13:58 -0800)
committerSage Weil <sage@inktank.com>
Thu, 3 Jan 2013 01:01:32 +0000 (17:01 -0800)
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>
src/log/Log.cc

index 2912463f6b665104801610282f1492b3880d9685..e06afbfe1e2c4b45934515e7079c331e190eef10 100644 (file)
@@ -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;