]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0729a78) | patch
crush: fix upmap overkill 26127/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 19 Jan 2019 09:19:10 +0000 (17:19 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 20 Feb 2019 08:03:08 +0000 (16:03 +0800)
commit119d8cb2a1d35473a77b4392b86d0f841fbba819
tree02888767804ef5166c6cd49a6251e77b83b2d698tree | snapshot
parent0729a78877eef994d595ba0f411919025ec0b3a4commit | diff
crush: fix upmap overkill

It appears that OSDMap::maybe_remove_pg_upmaps's sanity checks
are overzealous. With some customized crush rules it is possible
for osdmaptool to generate valid upmaps, but maybe_remove_pg_upmaps
will cancel them.

Fixes: http://tracker.ceph.com/issues/37968
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 5c4d241c7f796cb685e9944bf237028162122725)

Conflicts:
- maybe_remove_pg_upmaps input changing
        - slight c++11 auto conflicts
src/crush/CrushWrapper.cc diff | blob | history
src/crush/CrushWrapper.h diff | blob | history
src/osd/OSDMap.cc diff | blob | history
src/test/osd/TestOSDMap.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.