]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr: lock pg_map too for osd_pool_stats and notify_osdmap
authorSage Weil <sage@redhat.com>
Thu, 15 Nov 2018 22:27:18 +0000 (16:27 -0600)
committerxie xingguo <xie.xingguo@zte.com.cn>
Sun, 28 Apr 2019 10:14:50 +0000 (18:14 +0800)
commit8de7c28f933af9aeb02e0953c7ba124c8455c23f
treee67b77588b744aed968e64fbd2980a33af81d224
parentf8f52cdb619847513e142911e3a2d17cf2415faa
mgr: lock pg_map too for osd_pool_stats and notify_osdmap

Fixes: http://tracker.ceph.com/issues/36766
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 03a761c980a1171fe6adf7a463f3ab80ec6d4052)

Conflicts:
src/mgr/ActivePyModules.cc: migrate 'osd pool stats' command from mon to mgr (007eae7dd)
src/mgr/ClusterState.cc: Mutex::Locker -> std::lock_guard(948635a8)
src/mgr/Mgr.cc: silence warning from -Wsign-compare(a38ad971)
src/mgr/ClusterState.cc
src/mgr/Mgr.cc