From: Mykola Golub <mgolub@mirantis.com>
Date: Fri, 3 Jul 2015 10:46:26 +0000 (+0300)
Subject: mon: reset pending_proposal after dumping to log
X-Git-Tag: v9.0.3~26^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60ff33740d10bc16511c6e1bf0dee67ceac52e88;p=ceph.git

mon: reset pending_proposal after dumping to log

It fixes crashes when running with 'debug paxos = 30'.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 715d13e21586..5863792f61dc 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -1483,7 +1483,6 @@ void Paxos::propose_pending()
 
   bufferlist bl;
   pending_proposal->encode(bl);
-  pending_proposal.reset();
 
   dout(10) << __func__ << " " << (last_committed + 1)
 	   << " " << bl.length() << " bytes" << dendl;
@@ -1493,6 +1492,8 @@ void Paxos::propose_pending()
   f.flush(*_dout);
   *_dout << dendl;
 
+  pending_proposal.reset();
+
   committing_finishers.swap(pending_finishers);
   state = STATE_UPDATING;
   begin(bl);