From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 21 Sep 2023 15:51:31 +0000 (-0400)
Subject: Merge PR #50503 into main
X-Git-Tag: v19.0.0~446
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ab3e5ba744bb7fda37ba3c8067a476fd0eb2fff1;p=ceph.git

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>
---

ab3e5ba744bb7fda37ba3c8067a476fd0eb2fff1
diff --cc src/mon/OSDMonitor.cc
index 4e3f862b77eb3,3701ad9649ca0..cb2e2f79dcb89
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -12549,10 -12553,10 +12549,10 @@@ bool OSDMonitor::prepare_command_impl(M
      if (err) {
        ss << "unable to parse 'weights' value '"
           << cmd_vartype_stringify(cmdmap.at("weights")) << "'";
 -      goto reply;
 +      goto reply_no_propose;
      }
      pending_inc.new_weight.insert(weights.begin(), weights.end());
-     wait_for_finished_proposal(
+     wait_for_commit(
  	op,
  	new Monitor::C_Command(mon, op, 0, rs, rdata, get_last_committed() + 1));
      return true;
@@@ -12741,10 -12745,10 +12741,10 @@@
      if (err == EEXIST) {
        // idempotent operation
        err = 0;
 -      goto reply;
 +      goto reply_no_propose;
      }
  
-     wait_for_finished_proposal(op,
+     wait_for_commit(op,
          new Monitor::C_Command(mon, op, 0, rs, rdata,
                                 get_last_committed() + 1));
      force_immediate_propose();
@@@ -13301,10 -13309,10 +13301,10 @@@
      if (err == -EAGAIN)
        goto wait;
      if (err < 0)
 -      goto reply;
 +      goto reply_no_propose;
  
      getline(ss, rs);
-     wait_for_finished_proposal(op, new Monitor::C_Command(mon, op, 0, rs,
+     wait_for_commit(op, new Monitor::C_Command(mon, op, 0, rs,
  						   get_last_committed() + 1));
      return true;
    } else if (prefix == "osd tier add") {