From 257b85d87b820f4127d8ac38b05eaf6619b05b64 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 2 Dec 2011 16:01:57 -0800 Subject: [PATCH] osd: remove log_backlog from PG::Info Signed-off-by: Sage Weil --- src/osd/OSD.cc | 1 - src/osd/PG.cc | 12 ++++-------- src/osd/PG.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 351e1c3e7a882..1a51ef508c2d8 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4127,7 +4127,6 @@ void OSD::split_pg(PG *parent, map& children, ObjectStore::Transaction child->info.last_update = child->log.head; child->info.last_complete = parent->info.last_complete; child->info.log_tail = parent->log.tail; - child->info.log_backlog = parent->log.backlog; child->info.history.last_epoch_split = osdmap->get_epoch(); child->snap_trimq = parent->snap_trimq; diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 16a7f67bbac1f..71245ef0c3b73 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -107,7 +107,7 @@ A B C 3'7 | 3'8 | 3'9 | - -> i return full backlog. + -> i need to backfill. */ for (list::const_reverse_iterator i = other.log.rbegin(); @@ -419,7 +419,6 @@ void PG::merge_log(ObjectStore::Transaction& t, olog.log, from, to); info.log_tail = log.tail = olog.tail; - info.log_backlog = log.backlog = olog.backlog; changed = true; } @@ -1680,7 +1679,6 @@ void PG::trim(ObjectStore::Transaction& t, eversion_t trim_to) dout(10) << "trim " << log << " to " << trim_to << dendl; log.trim(t, trim_to); info.log_tail = log.tail; - info.log_backlog = log.backlog; trim_ondisklog(t); } } @@ -2084,8 +2082,6 @@ void PG::read_state(ObjectStore *store) // reset info info.log_tail = info.last_update; - info.log_backlog = false; - log.backlog = false; // Move the corrupt log to a new place and create a new zero-length log entry. ObjectStore::Transaction t; @@ -3974,7 +3970,7 @@ boost::statechart::result PG::RecoveryState::ReplicaActive::react(const MLogRec& pg->merge_log(*context().get_cur_transaction(), msg->info, msg->log, logevt.from); - assert(pg->log.tail <= pg->info.last_complete || pg->log.backlog); + assert(pg->log.tail <= pg->info.last_complete); assert(pg->log.head == pg->info.last_update); return discard_event(); @@ -4023,7 +4019,7 @@ boost::statechart::result PG::RecoveryState::Stray::react(const MLogRec& logevt) pg->merge_log(*context().get_cur_transaction(), msg->info, msg->log, logevt.from); - assert(pg->log.tail <= pg->info.last_complete || pg->log.backlog); + assert(pg->log.tail <= pg->info.last_complete); assert(pg->log.head == pg->info.last_update); post_event(Activate()); @@ -4036,7 +4032,7 @@ boost::statechart::result PG::RecoveryState::Stray::react(const MInfoRec& infoev dout(10) << "got info from osd." << infoevt.from << dendl; if (pg->is_replica()) { - assert(pg->log.tail <= pg->info.last_complete || pg->log.backlog); + assert(pg->log.tail <= pg->info.last_complete); assert(pg->log.head == pg->info.last_update); post_event(Activate()); } else { diff --git a/src/osd/PG.h b/src/osd/PG.h index 93c72b34483e9..5c583aed03ae7 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -174,7 +174,6 @@ public: eversion_t last_complete; // last version pg was complete through. eversion_t log_tail; // oldest log entry. - bool log_backlog; // do we store a complete log? interval_set incomplete; // incomplete hash ranges prior to last_complete @@ -249,8 +248,8 @@ public: } } history; - Info() : log_backlog(false) {} - Info(pg_t p) : pgid(p), log_backlog(false) { } + Info() {} + Info(pg_t p) : pgid(p) { } bool is_empty() const { return last_update.version == 0; } bool dne() const { return history.epoch_created == 0; } @@ -258,14 +257,13 @@ public: bool is_incomplete() const { return !incomplete.empty(); } void encode(bufferlist &bl) const { - __u8 v = 24; + __u8 v = 25; ::encode(v, bl); ::encode(pgid, bl); ::encode(last_update, bl); ::encode(last_complete, bl); ::encode(log_tail, bl); - ::encode(log_backlog, bl); ::encode(incomplete, bl); ::encode(stats, bl); history.encode(bl); @@ -285,7 +283,10 @@ public: ::decode(last_update, bl); ::decode(last_complete, bl); ::decode(log_tail, bl); - ::decode(log_backlog, bl); + if (v < 25) { + bool log_backlog; + ::decode(log_backlog, bl); + } if (v >= 24) ::decode(incomplete, bl); ::decode(stats, bl); @@ -1776,8 +1777,7 @@ inline ostream& operator<<(ostream& out, const PG::Info& pgi) out << " v " << pgi.last_update; if (pgi.last_complete != pgi.last_update) out << " lc " << pgi.last_complete; - out << " (" << pgi.log_tail << "," << pgi.last_update << "]" - << (pgi.log_backlog ? "+backlog":""); + out << " (" << pgi.log_tail << "," << pgi.last_update << "]"; if (!pgi.incomplete.empty()) out << " incomp " << std::hex << pgi.incomplete << std::dec; } -- 2.39.5