]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: cleanup: Remove unused code - waiting_for_all_missing list and wait_for_all_miss...
authorDavid Zafman <dzafman@redhat.com>
Thu, 15 Jun 2017 17:53:48 +0000 (10:53 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 23 Jun 2017 15:02:50 +0000 (08:02 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/PG.h
src/osd/PrimaryLogPG.cc

index e93549e9f83fc7f81f3556e407c33f86778e1c68..6213166d7407523e585caa63047959be7992fc0c 100644 (file)
@@ -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;
index b50624963a5c30fe6b3f297d4c2d8dc7da5e4008..85b197960a3a5d28acbf818e5ac23c55d91a6a21 100644 (file)
@@ -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();