]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: remove up_thru_pending field, which is never used
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 9 Mar 2016 11:17:46 +0000 (19:17 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 9 Mar 2016 11:17:46 +0000 (19:17 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc
src/osd/OSD.h

index bc636a4d6a8381d1d41e46d13c0f6c1c09a1bdba..cf3408f5f4d0451efc520f05b6d78eafb6194002 100644 (file)
@@ -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));
   }
index 57848540204f1a92f4734c15cb1e918b6b3c6755..50d47ea2e9d2f36f2a69f8629a866aae71eca311 100644 (file)
@@ -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();