From 693950bfb32424e42d84d9674cb7f017b1fb79d9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 2 Dec 2011 16:35:04 -0800 Subject: [PATCH] osd: cleanup lingering backlog refs Signed-off-by: Sage Weil --- src/osd/PG.cc | 4 ++-- src/osd/PG.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 61fd2fdea197f..d039309895945 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3431,7 +3431,7 @@ void PG::Missing::add_next_event(const Log::Entry& e) missing[e.soid].need = e.version; // leave .have unchanged. } else if (e.is_backlog()) { // May not have prior version - missing[e.soid].need = e.version; + assert(0 == "these don't exist anymore"); } else { // not missing, we must have prior_version (if any) missing[e.soid] = item(e.version, e.prior_version); @@ -4474,7 +4474,7 @@ void PG::RecoveryState::handle_backfill_complete(RecoveryCtx *rctx) void PG::RecoveryState::handle_loaded(RecoveryCtx *rctx) { - dout(10) << "handle_backlog_loaded" << dendl; + dout(10) << "handle_loaded" << dendl; start_handle(rctx); machine.process_event(Load()); end_handle(); diff --git a/src/osd/PG.h b/src/osd/PG.h index 9a81cbc9ca8a5..5f863eb418fa8 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -361,7 +361,7 @@ public: MODIFY = 1, CLONE = 2, DELETE = 3, - BACKLOG = 4, // event invented by generate_backlog + BACKLOG = 4, // event invented by generate_backlog [deprecated] LOST_REVERT = 5, // lost new version, revert to an older version. LOST_DELETE = 6, // lost new version, revert to no object (deleted). LOST_MARK = 7, // lost new version, now EIO -- 2.39.5