]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #50503 into main
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 21 Sep 2023 15:51:31 +0000 (11:51 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 21 Sep 2023 15:51:31 +0000 (11:51 -0400)
commitab3e5ba744bb7fda37ba3c8067a476fd0eb2fff1
tree9b3b9f38528d90a3190170e1c75a1e15fe259d5e
parent0c8bd683b5acaab6e3eeb11cec820df89525d809
parent27f1021a97edc2c84801cb380c22c7cd79d577d6
Merge PR #50503 into main

* refs/pull/50503/head:
mon: do not change pending if strategy is unchanged
mon/MonmapMonitor: do not propose on error in prepare_update
mon/MonmapMonitor: wait for commit before reply
mon: use wait_for_commit to reply
mon: add context list for commit wait
mon: remove unused method
test/mon: add commit benchmark script
mon/MonClient: provide config to target specific rank

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
src/common/options/global.yaml.in
src/mon/AuthMonitor.cc
src/mon/MDSMonitor.cc
src/mon/MgrMonitor.cc
src/mon/MonClient.cc
src/mon/OSDMonitor.cc