From: Sage Weil <sage@inktank.com>
Date: Thu, 11 Jul 2013 20:41:23 +0000 (-0700)
Subject: mon: fix recent paxos sync from 0 when first_committed == 1
X-Git-Tag: v0.67-rc1~59^2~20^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e213b1bc25a212ffe42623c1d4b4eadf9f69319e;p=ceph.git

mon: fix recent paxos sync from 0 when first_committed == 1

This is okay; allow it.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index b639a8e32aa0..a1959a08c89e 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1030,7 +1030,8 @@ void Monitor::handle_sync_get_chunk(MMonSync *m)
   SyncProvider& sp = sync_providers[m->cookie];
   sp.reset_timeout(g_ceph_context, g_conf->mon_sync_timeout * 2);
 
-  if (sp.last_committed < paxos->get_first_committed()) {
+  if (sp.last_committed < paxos->get_first_committed() &&
+      paxos->get_first_committed() >= 1) {
     dout(10) << __func__ << " sync requester fell behind paxos, their lc " << sp.last_committed
 	     << " < our fc " << paxos->get_first_committed() << dendl;
     sync_providers.erase(m->cookie);