Merge pull request #22115 from pdvian/wip-24048-luminous

luminous: crush, osd: handle multiple parents properly when applying pg upmaps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --cc src/crush/CrushWrapper.cc
Simple merge

diff --cc src/crush/CrushWrapper.h
Simple merge

diff --cc src/osd/OSDMap.cc
Simple merge