From 187b84d390496506d15d808412f43b6c80a4f514 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 9 Apr 2008 18:33:34 -0700 Subject: [PATCH] osd: take out last_epoch_finished.. its not used anymore --- src/osd/OSD.cc | 5 ----- src/osd/PG.h | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 2dc5141c74fc4..14dc9f8ed7500 100644 --- 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 tacting; int nrep = osdmap->pg_to_acting_osds(pgid, tacting); diff --git a/src/osd/PG.h b/src/osd/PG.h index 4cfccb5fd2e17..0c0ad6574b4d4 100644 --- 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; -- 2.39.5