]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/PaxosService: fix trim completion
authorSage Weil <sage@inktank.com>
Sat, 13 Jul 2013 04:42:19 +0000 (21:42 -0700)
committerSage Weil <sage@inktank.com>
Sat, 13 Jul 2013 05:04:53 +0000 (22:04 -0700)
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>
src/mon/PaxosService.cc

index 42452e9cfa8d33e507dc06b764323a0e08c5912f..973277d38e84ce95ff1a628063d4954f643f07f7 100644 (file)
@@ -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,