From bf4f8024ba39c7a44258b5035698efa796300727 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 12 Jul 2013 21:42:19 -0700 Subject: [PATCH] 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 --- src/mon/PaxosService.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index 42452e9cfa8d3..973277d38e84c 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, -- 2.39.5