From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 9 Mar 2016 11:17:46 +0000 (+0800)
Subject: osd: remove up_thru_pending field, which is never used
X-Git-Tag: v10.1.0~159^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ea8769ba7117d4c30c167572b2e015a68e50d3f;p=ceph.git

osd: remove up_thru_pending field, which is never used

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bc636a4d6a83..cf3408f5f4d0 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1602,7 +1602,7 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
   last_pg_create_epoch(0),
   mon_report_lock("OSD::mon_report_lock"),
   stats_ack_timeout(cct->_conf->osd_mon_ack_timeout),
-  up_thru_wanted(0), up_thru_pending(0),
+  up_thru_wanted(0),
   requested_full_first(0),
   requested_full_last(0),
   pg_stat_queue_lock("OSD::pg_stat_queue_lock"),
@@ -4801,7 +4801,6 @@ void OSD::send_alive()
   epoch_t up_thru = osdmap->get_up_thru(whoami);
   dout(10) << "send_alive up_thru currently " << up_thru << " want " << up_thru_wanted << dendl;
   if (up_thru_wanted > up_thru) {
-    up_thru_pending = up_thru_wanted;
     dout(10) << "send_alive want " << up_thru_wanted << dendl;
     monc->send_mon_message(new MOSDAlive(osdmap->get_epoch(), up_thru_wanted));
   }
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 57848540204f..50d47ea2e9d2 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2019,7 +2019,6 @@ protected:
 
   // -- alive --
   epoch_t up_thru_wanted;
-  epoch_t up_thru_pending;
 
   void queue_want_up_thru(epoch_t want);
   void send_alive();