Merge pull request #16239 from xiexingguo/wip-crush-weight-overflow

mon: a few more upmap (and other) fixes

Reviewed-by: Sage Weil <sage@redhat.com>

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

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

diff --cc src/mon/OSDMonitor.cc
Simple merge

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