]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/OSDMap: fix upmap mis-killing for erasure-coded PGs 25419/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 1 Dec 2018 09:42:01 +0000 (17:42 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Thu, 6 Dec 2018 04:00:42 +0000 (12:00 +0800)
commitfb4a9224d7580a0c0e1e206a6216a754c4a32e3c
tree2b7e53a5d5f17a479340f63ebee75fc33782566c
parent4669ca6919ccdb44921a968a006905a6a0eb6804
osd/OSDMap: fix upmap mis-killing for erasure-coded PGs

The up-set of erasure-coded PGs may include CRUSH_ITEM_NONE,
which as a result causes mis-killing of valid upmap items.

Fixes: https://tracker.ceph.com/issues/37493
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: ningtao <ningtao@sangfor.com.cn>
(cherry picked from commit f043dcc6d8663ed960a354b2441fd3f8dd66c62d)

Conflicts:
        - *maybe_remove_pg_upmaps* input changed, in master
          we now have a passed in *nextmap* parameter
src/osd/OSDMap.cc
src/test/osd/TestOSDMap.cc