From: Sage Weil <sage@newdream.net>
Date: Mon, 26 Jan 2009 23:25:56 +0000 (-0800)
Subject: osd: fix up_thru_pending conditional
X-Git-Tag: v0.7~304
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee916bd1f7271446af62ba05e311f0e1418b080c;p=ceph.git

osd: fix up_thru_pending conditional

up_thru_pending only meaningful if non-zero.
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 50a818b63c22..867d9a449540 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1191,6 +1191,7 @@ void OSD::do_mon_report()
     retry = true;
   }
   if (osdmap->exists(whoami) && 
+      up_thru_pending &&
       up_thru_pending < osdmap->get_up_thru(whoami)) {
     dout(10) << "up_thru_pending " << up_thru_pending << " < " << osdmap->get_up_thru(whoami) 
 	     << " -- still pending" << dendl;