]> 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: 1db8ea3) | patch
mgr/DaemonServer: add explicit check that acting matches for merge 34354/head
authorSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 21:52:01 +0000 (16:52 -0500)
committerNathan Cutler <ncutler@suse.com>
Wed, 1 Apr 2020 20:13:06 +0000 (22:13 +0200)
commite568a633ae932b41b1fecea1066912e006492ddf
tree0bf85c3d3c922d7bec7413d847b2be32b1a90a53tree | snapshot
parent1db8ea322100993f97e512c822fa5d930c21db8dcommit | diff
mgr/DaemonServer: add explicit check that acting matches for merge

Add an explicit check that the PG acting for the source and target
match before merging.

Fixes: https://tracker.ceph.com/issues/44684
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1700d181580f9ffc9a808ee29daf661f3776a901)
src/mgr/DaemonServer.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.