]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/PG: fix not_ready_to_merge behavior for merge target 24226/head
authorSage Weil <sage@redhat.com>
Sat, 22 Sep 2018 16:01:15 +0000 (11:01 -0500)
committerSage Weil <sage@redhat.com>
Mon, 24 Sep 2018 16:03:03 +0000 (11:03 -0500)
commitfcb1679eab4240c046ba922060c20423fb35ce43
tree20bad25d9f26b965733c90da67869658e88aeaf0
parentf90edeb11043de03d6ed076b570ca22605215bc1
osd/PG: fix not_ready_to_merge behavior for merge target

Track the *target* not being ready to merge independently from the source,
so that we do not have two PGs fighting over the state of
not_ready_ready_to_merge_source, and so that the map reflects the *source*
PGs readiness only.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc