From 732286a28cd8a643593d490a7a84a590d372f78d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 22 Jul 2013 14:13:23 -0700 Subject: [PATCH] mon/Paxos: only share uncommitted value if it is next We may have an uncommitted value from our perspective (it is our lc + 1) when the collector has a much larger lc (because we have been out for the last few rounds). Only share an uncommitted value if it is in fact the next value. Signed-off-by: Sage Weil (cherry picked from commit b26b7f6e5e02ac6beb66e3e34e177e6448cf91cf) --- src/mon/Paxos.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 01e062098721..b52986cf401c 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -205,7 +205,8 @@ void Paxos::handle_collect(MMonPaxos *collect) // do we have an accepted but uncommitted value? // (it'll be at last_committed+1) bufferlist bl; - if (get_store()->exists(get_name(), last_committed+1)) { + if (collect->last_committed == last_committed && + get_store()->exists(get_name(), last_committed+1)) { get_store()->get(get_name(), last_committed+1, bl); assert(bl.length() > 0); dout(10) << " sharing our accepted but uncommitted value for " -- 2.47.3