]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr: fix locking for MetadataUpdate::finish 44720/head
authorSage Weil <sage@newdream.net>
Wed, 24 Nov 2021 18:22:26 +0000 (13:22 -0500)
committerCory Snyder <csnyder@iland.com>
Fri, 21 Jan 2022 17:15:06 +0000 (12:15 -0500)
commit92a74300fecdd6c99b4ff6ba929477d2e324fd1a
tree3064b9f07ff679bd7cf370ea9a33674d5c9d6224
parent6d0261fcb9458c90b6f509c036c9df47e35eb281
mgr: fix locking for MetadataUpdate::finish

We need to hold the DaemonState lock here since we are both reading and
writing its content.

Fixes: https://tracker.ceph.com/issues/53393
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 5096685cd623de71a7c45a667e1dd776357fd997)

Conflicts:
src/mgr/Mgr.cc

Cherry-pick notes:
- state variable was declared outside of if condition in Octopus
src/mgr/Mgr.cc