From 3f5ced696025f0166402830b5ba33b909c55d643 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 2 Dec 2011 15:44:35 -0800
Subject: [PATCH] osd: kill backlog_requested

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---
 src/osd/PG.cc | 9 +--------
 src/osd/PG.h  | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 20cca12a6acaf..0f4deb676783f 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -601,11 +601,6 @@ void PG::discover_all_missing(map< int, map<pg_t,PG::Query> > &query_map)
 	       << ": in peer_log_requested" << dendl;
       continue;
     }
-    if (peer_backlog_requested.find(peer) != peer_backlog_requested.end()) {
-      dout(20) << __func__ << ": osd." << peer
-	       << ": in peer_backlog_requested" << dendl;
-      continue;
-    }
     if (peer_missing_requested.find(peer) != peer_missing_requested.end()) {
       dout(20) << __func__ << ": osd." << peer
 	       << ": in peer_missing_requested" << dendl;
@@ -872,7 +867,6 @@ void PG::clear_primary_state()
   stray_set.clear();
   backfill.clear();
   peer_log_requested.clear();
-  peer_backlog_requested.clear();
   peer_missing_requested.clear();
   peer_info.clear();
   peer_missing.clear();
@@ -1572,7 +1566,6 @@ void PG::purge_strays()
   // clear _requested maps; we may have to peer() again if we discover
   // (more) stray content
   peer_log_requested.clear();
-  peer_backlog_requested.clear();
   peer_missing_requested.clear();
 }
 
@@ -4011,7 +4004,7 @@ void PG::RecoveryState::ReplicaActive::exit() {
 
 /*-------Stray---*/
 PG::RecoveryState::Stray::Stray(my_context ctx) 
-  : my_base(ctx), backlog_requested(false) {
+  : my_base(ctx) {
   state_name = "Started/Stray";
   context< RecoveryMachine >().log_enter(state_name);
 
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 73da9c75ef499..93c72b34483e9 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1243,7 +1243,6 @@ public:
     };
 
     struct Stray : boost::statechart::state< Stray, Started >, NamedState {
-      bool backlog_requested;
       map<int, pair<Query, epoch_t> > pending_queries;
 
       Stray(my_context ctx);
@@ -1361,7 +1360,6 @@ protected:
   map<int,Info>        peer_info;   // info from peers (stray or prior)
   map<int, Missing>    peer_missing;
   set<int>             peer_log_requested;  // logs i've requested (and start stamps)
-  set<int>             peer_backlog_requested;
   set<int>             peer_missing_requested;
   set<int>             stray_purged;  // i deleted these strays; ignore racing PGInfo from them
   set<int>             peer_activated;
-- 
2.39.5