]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0ec4c22) | patch
mgr/DaemonServer: handle_conf_change - fix broken locking 29213/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 26 Mar 2019 08:08:43 +0000 (16:08 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 23 Jul 2019 12:22:55 +0000 (14:22 +0200)
commit0acb397a66e6c295cd7b542a2ddb5ea3a4922514
tree399f47fedad773536a943f8e80e8f595682a9208tree | snapshot
parent0ec4c2255c349e7b1fe14a7630c6856dc692a843commit | diff
mgr/DaemonServer: handle_conf_change - fix broken locking

The is_locked_by_me() is only meant to be safe if you know
you hold the lock. It's meant to be used in an assertion.

Fixes: http://tracker.ceph.com/issues/38899
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit a929a5a01508e661fc7f3cea52822320d39983d2)

Conflicts:
src/mgr/DaemonServer.cc
- leave untouched the mysterious "ohai" log message
- use Mutex::Locker instead of std::lock_guard
src/mgr/DaemonServer.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.