Merge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending

osd: remove up_thru_pending field, which is never used Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Mar 11, 2016 · f0c512b · f0c512b
2 parents 9e86b53 + cf0665e
commit f0c512b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -2019,7 +2019,6 @@ class OSD : public Dispatcher,
 
   // -- alive --
   epoch_t up_thru_wanted;
-  epoch_t up_thru_pending;
 
   void queue_want_up_thru(epoch_t want);
   void send_alive();

diff --git a/src/osd/PG.h b/src/osd/PG.h
@@ -1121,10 +1121,6 @@ class PG : DoutPrefixProvider {
   void split_into(pg_t child_pgid, PG *child, unsigned split_bits);
   virtual void _split_into(pg_t child_pgid, PG *child, unsigned split_bits) = 0;
 
-  loff_t get_log_write_pos() {
-    return 0;
-  }
-
   friend class C_OSD_RepModify_Commit;