Merge pull request #56400 from batrick/wip-62923-reef

reef: mon/MonmapMonitor: do not propose on error in prepare_update

Reviewed-by: Venky Shankar <vshankar@redhat.com>

diff --cc src/common/options/global.yaml.in
Simple merge

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

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

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

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

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

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

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