]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/OSDMap: do not trust partially simplified pg_upmap_item 30926/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 25 Sep 2019 11:36:10 +0000 (19:36 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 15 Oct 2019 09:31:07 +0000 (11:31 +0200)
commit010494b29eb9411c1af2160919f6eca40774dc74
tree00fe6d968a9c4640d55dc9538f4f823ef0d8a63c
parent6b3ac130b9ebbc4ecda4bf5011908f56aa38f211
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)

Conflicts:
src/osd/OSDMap.cc
src/osd/OSDMap.cc
src/test/osd/TestOSDMap.cc