]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commit
Fix deadlock when calling getMergedHistogram
authorChangli Gao <xiaosuo@gmail.com>
Mon, 21 Nov 2016 02:14:33 +0000 (18:14 -0800)
committerFacebook Github Bot <facebook-github-bot-bot@fb.com>
Mon, 21 Nov 2016 02:24:12 +0000 (18:24 -0800)
commita0deec960f3a8190831c673e5ba998fe6fb7ea90
tree84188695831e2ea8151ba8493c68e529f2aed056
parentfe349db57b3f3ec817324912996cddd37cf80405
Fix deadlock when calling getMergedHistogram

Summary:
When calling StatisticsImpl::HistogramInfo::getMergedHistogram(), if
there is a dying thread, which is calling
ThreadLocalPtr::StaticMeta::OnThreadExit() to merge its thread values to
HistogramInfo, deadlock will occur. Because the former try to hold
merge_lock then ThreadMeta::mutex_, but the later try to hold
ThreadMeta::mutex_ then merge_lock. In short, the locking order isn't
the same.

This patch addressed this issue by releasing merge_lock before folding
thread values.
Closes https://github.com/facebook/rocksdb/pull/1552

Differential Revision: D4211942

Pulled By: ajkr

fbshipit-source-id: ef89bcb
util/statistics.cc