]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.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)
committerNathan Cutler <ncutler@suse.com>
Mon, 14 Oct 2019 12:34:15 +0000 (14:34 +0200)
commit9dff01ddb66f64cf2153c5875e80ea54618740de
tree8967eb410b6fd2409a0b5f94bc4ccb3fa0de6719
parent6bd64f37f60816660a82db0da2abcc49f30d9ddd
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>
(cherry picked from commit 4196b13283144de966eeba40e6765f10b254dac6)
src/osd/OSDMap.cc
src/test/osd/TestOSDMap.cc