From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Sep 2009 22:57:06 +0000 (-0700)
Subject: mon: fix bug with client id assignment of -1
X-Git-Tag: v0.15~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2c7655093821710aac2b4d35ccb1740429eb402;p=ceph.git

mon: fix bug with client id assignment of -1
---

diff --git a/src/mon/ClientMonitor.cc b/src/mon/ClientMonitor.cc
index 689011b389c..a2f0d7ba04d 100644
--- a/src/mon/ClientMonitor.cc
+++ b/src/mon/ClientMonitor.cc
@@ -63,7 +63,7 @@ bool ClientMonitor::update_from_paxos()
 
   paxos->stash_latest(paxosv, bl);
 
-  if (next_client < 0) {
+  if (next_client <= client_map.next_client) {
     dout(10) << "in-core next_client reset to " << client_map.next_client << dendl;
     next_client = client_map.next_client;
   }
@@ -73,8 +73,8 @@ bool ClientMonitor::update_from_paxos()
 
 void ClientMonitor::on_election_start()
 {
-  dout(10) << "in-core next_client cleared" << dendl;
-  next_client = -1;
+  dout(10) << "in-core next_client reset to " << client_map.next_client << dendl;
+  next_client = client_map.next_client;
 }
 
 void ClientMonitor::create_pending()