]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/OSDMap: fix upmap mis-killing for erasure-coded PGs 25418/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 03:12:22 +0000 (11:12 +0800)
commitf6e842729d13a1316fc86008f3fba44088b226e1
tree0ab18e6a270d8c79bec4c18662190832a7dc5fb6
parente33e8fb92810f8bab5d2260dcebb7f8180130cfd
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