update ceph source to reef 18.1.2

[ceph.git] / ceph / src / mon / PaxosService.cc

diff --git a/ceph/src/mon/PaxosService.cc b/ceph/src/mon/PaxosService.cc
index 0a6a9a9ea70f6afd96e8ed0da4ffa9e3e565d88e..cfe11cb5049e836bd9529938db4bf72ace2e90aa 100644 (file)
--- a/ceph/src/mon/PaxosService.cc
+++ b/ceph/src/mon/PaxosService.cc
@@ -100,7 +100,6 @@ bool PaxosService::dispatch(MonOpRequestRef op)
 
   if (need_immediate_propose) {
     dout(10) << __func__ << " forced immediate propose" << dendl;
-    need_immediate_propose = false;
     propose_pending();
     return true;
   }
@@ -224,6 +223,7 @@ void PaxosService::propose_pending()
 
   // apply to paxos
   proposing = true;
+  need_immediate_propose = false; /* reset whenever we propose */
   /**
    * Callback class used to mark us as active once a proposal finishes going
    * through Paxos.