]> 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: a4b58f4) | patch
crush, osd: handle multiple parents properly when applying pg upmaps 22115/head
authorxiexingguo <xie.xingguo@gmail.com>
Fri, 4 May 2018 13:20:29 +0000 (21:20 +0800)
committerPrashant D <pdhange@redhat.com>
Thu, 7 Jun 2018 10:39:59 +0000 (06:39 -0400)
commit2331cd21462f7a20792d10ebef0aeaed1c017111
tree5202e9fbdc217b3d757ecd1c3fd00938b0c0c01btree | snapshot
parenta4b58f4de56ee1897b0715b915ff86468fa98f3dcommit | diff
crush, osd: handle multiple parents properly when applying pg upmaps

Fixes: http://tracker.ceph.com/issues/23921
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
(cherry picked from commit 482ec97c98107be20c9ca1f34636323703ecfa5c)

Conflicts:
src/crush/CrushWrapper.h : Resolved for get_children_of_type
src/crush/CrushWrapper.cc diff | blob | history
src/crush/CrushWrapper.h diff | blob | history
src/osd/OSDMap.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.