From 1ea8769ba7117d4c30c167572b2e015a68e50d3f Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 9 Mar 2016 19:17:46 +0800 Subject: [PATCH] osd: remove up_thru_pending field, which is never used Signed-off-by: xie xingguo --- src/osd/OSD.cc | 3 +-- src/osd/OSD.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index bc636a4d6a838..cf3408f5f4d04 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 57848540204f1..50d47ea2e9d2f 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(); -- 2.39.5