mon/MonmapMonitor: wait for commit before reply

If the monmap is changed, do not reply to command until committed!

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index d162b8e9414cf798228ba44b898bb6d124693abf..3d77ab6b3a5f0d5f928563bb8cd6867970bba9d1 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -1212,8 +1212,11 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
 
 reply:
   getline(ss, rs);
-  mon.reply_command(op, err, rs, get_last_committed());
-  // we are returning to the user; do not propose.
+  if (propose) {
+    wait_for_commit(op, new Monitor::C_Command(mon, op, err, rs, get_last_committed() + 1));
+  } else {
+    mon.reply_command(op, err, rs, get_last_committed());
+  }
   return propose;
 }