From: David Zafman <dzafman@redhat.com>
Date: Thu, 15 Jun 2017 17:53:48 +0000 (-0700)
Subject: osd: cleanup: Remove unused code - waiting_for_all_missing list and wait_for_all_miss... 
X-Git-Tag: ses5-milestone8~1^2~19^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfd3743bf89028d733f9df249a664dce7e6d355f;p=ceph.git

osd: cleanup: Remove unused code - waiting_for_all_missing list and wait_for_all_missing()

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index e93549e9f83f..6213166d7407 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -904,7 +904,6 @@ protected:
   list<OpRequestRef>            waiting_for_scrub;
 
   list<OpRequestRef>            waiting_for_cache_not_full;
-  list<OpRequestRef>            waiting_for_all_missing;
   map<hobject_t, list<OpRequestRef>> waiting_for_unreadable_object,
 			     waiting_for_degraded_object,
 			     waiting_for_blocked_object;
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index b50624963a5c..85b197960a3a 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -418,10 +418,6 @@ void PrimaryLogPG::on_local_recover(
 	waiting_for_unreadable_object.erase(unreadable_object_entry);
       }
     }
-    if (pg_log.get_missing().get_items().size() == 0) {
-      requeue_ops(waiting_for_all_missing);
-      waiting_for_all_missing.clear();
-    }
   } else {
     t->register_on_applied(
       new C_OSD_AppliedRecoveredObjectReplica(this));
@@ -571,12 +567,6 @@ void PrimaryLogPG::wait_for_unreadable_object(
   op->mark_delayed("waiting for missing object");
 }
 
-void PrimaryLogPG::wait_for_all_missing(OpRequestRef op)
-{
-  waiting_for_all_missing.push_back(op);
-  op->mark_delayed("waiting for all missing");
-}
-
 bool PrimaryLogPG::is_degraded_or_backfilling_object(const hobject_t& soid)
 {
   /* The conditions below may clear (on_local_recover, before we queue
@@ -10471,8 +10461,6 @@ void PrimaryLogPG::mark_all_unfound_lost(
     std::move(manager),
     boost::optional<std::function<void(void)> >(
       [=]() {
-	requeue_ops(waiting_for_all_missing);
-	waiting_for_all_missing.clear();
 	for (auto& p : waiting_for_unreadable_object) {
 	  release_backoffs(p.first);
 	}
@@ -10759,10 +10747,8 @@ void PrimaryLogPG::on_change(ObjectStore::Transaction *t)
 
   if (is_primary()) {
     requeue_ops(waiting_for_cache_not_full);
-    requeue_ops(waiting_for_all_missing);
   } else {
     waiting_for_cache_not_full.clear();
-    waiting_for_all_missing.clear();
   }
   objects_blocked_on_cache_full.clear();