]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix recent paxos sync from 0 when first_committed == 1
authorSage Weil <sage@inktank.com>
Thu, 11 Jul 2013 20:41:23 +0000 (13:41 -0700)
committerSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 18:12:59 +0000 (11:12 -0700)
This is okay; allow it.

Signed-off-by: Sage Weil <sage@inktank.com>
src/mon/Monitor.cc

index b639a8e32aa0350f2286a7ca0e74021f90ae060c..a1959a08c89ea9113f9c0e0ba29b65dfc436f1e2 100644 (file)
@@ -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);