From: Sage Weil <sage@inktank.com>
Date: Sat, 13 Jul 2013 04:42:19 +0000 (-0700)
Subject: mon/PaxosService: fix trim completion
X-Git-Tag: v0.67-rc1~74^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf4f8024ba39c7a44258b5035698efa796300727;p=ceph.git

mon/PaxosService: fix trim completion

Do not call C_Committed after trim or else we will prematurely clear
the bool proposing, propose something again using the same version, and
crash.  We do not in fact need anything to happen here aside from the
refresh_from_paxos() that happens on its own.

Broken by 39b71c582628d26e749c23343aa69db079ee40a1.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 42452e9cfa8..973277d38e8 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -357,7 +357,7 @@ void PaxosService::maybe_trim()
 
   bufferlist bl;
   t.encode(bl);
-  paxos->propose_new_value(bl, new C_Committed(this));
+  paxos->propose_new_value(bl, NULL);
 }
 
 void PaxosService::trim(MonitorDBStore::Transaction *t,