osd: take out last_epoch_finished.. its not used anymore

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2dc5141c74fc4fcced7bbcc80ed0f359c6ed2cc9..14dc9f8ed750096deac6c2036e031407e8751f77 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1476,11 +1476,6 @@ void OSD::advance_map(ObjectStore::Transaction& t)
     pg_t pgid = it->first;
     PG *pg = it->second;
     
-    // did i finish this epoch?
-    if (pg->is_active()) {
-      pg->info.last_epoch_finished = osdmap->get_epoch()-1;
-    }      
-    
     // get new acting set
     vector<int> tacting;
     int nrep = osdmap->pg_to_acting_osds(pgid, tacting);

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 4cfccb5fd2e17f69e40430af8aaba981fb78ea48..0c0ad6574b4d40aebfdd6bf8dca6a5de90f628ae 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -68,7 +68,6 @@ public:
 
     epoch_t epoch_created;       // epoch in which it was created
     epoch_t last_epoch_started;  // last epoch started.
-    epoch_t last_epoch_finished; // last epoch finished.
 
     struct History {
       epoch_t same_since;          // same acting set since
@@ -80,7 +79,8 @@ public:
     Info(pg_t p=0) : pgid(p), 
                      log_backlog(false),
                     epoch_created(0),
-                     last_epoch_started(0), last_epoch_finished(0) {}
+                     last_epoch_started(0)
+    { }
     bool is_uptodate() const { return last_update == last_complete; }
     bool is_empty() const { return last_update.version == 0; }
     bool dne() const { return epoch_created == 0; }
@@ -658,7 +658,7 @@ inline ostream& operator<<(ostream& out, const PG::Info& pgi)
         << " (" << pgi.log_bottom << "," << pgi.last_update << "]"
         << (pgi.log_backlog ? "+backlog":"");
   //out << " c " << pgi.epoch_created;
-  out << " e " << pgi.last_epoch_started << "/" << pgi.last_epoch_finished
+  out << " e " << pgi.last_epoch_started
       << " " << pgi.history
       << ")";
   return out;