osd: cleanup lingering backlog refs

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 61fd2fdea197f637f9d3781c9509682fc9402dc3..d03930989594592cbd7a084f1cd7c8f42444c66a 100644 (file)
--- 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 9a81cbc9ca8a56dddf7772db65309a609d4cb4fb..5f863eb418fa84fbbfea2b3c4542cd9a4d8e028e 100644 (file)
--- 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