]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/OSDMap: do not trust partially simplified pg_upmap_item
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 25 Sep 2019 11:36:10 +0000 (19:36 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 25 Sep 2019 13:28:27 +0000 (21:28 +0800)
commit4196b13283144de966eeba40e6765f10b254dac6
tree7f98faa7808a465a51d77739e2d6f9b0ab2ad042
parentf90e3e102659c7930222a213e86f19d5caf736cd
osd/OSDMap: do not trust partially simplified pg_upmap_item

If we simplified a partially no-op pg_upmap_item, we shall still
continue to verify that the remaining part is valid.
The bug is introduced by 02e5499b350bcd7d9eac98b2072052a9a4a1f535,
before which we always validate the correctness of a pg_upmap_item
before trying to cancel or simplify it.

Fixes: https://tracker.ceph.com/issues/42052
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSDMap.cc
src/test/osd/TestOSDMap.cc