From: Samuel Just <sam.just@inktank.com>
Date: Tue, 24 Sep 2013 23:17:33 +0000 (-0700)
Subject: ReplicatedPG: remove noop C_OSD_CompletedPull
X-Git-Tag: v0.71~68^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07905af8ff12a6bea8cbff454e17c8d79e1a0178;p=ceph.git

ReplicatedPG: remove noop C_OSD_CompletedPull

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 9c9b4fb6bb92..f1155a0f897e 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -168,8 +168,6 @@ void ReplicatedPG::on_local_recover(
 
     t->register_on_applied(new C_OSD_AppliedRecoveredObject(this, obc));
     t->register_on_applied_sync(new C_OSD_OndiskWriteUnlock(obc));
-    t->register_on_complete(
-      new C_OSD_CompletedPull(this, hoid, get_osdmap()->get_epoch()));
 
     publish_stats_to_osd();
     if (waiting_for_missing_object.count(hoid)) {
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 05fbe0fa7920..e24592e932f3 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -700,18 +700,6 @@ protected:
       pg->_committed_pushed_object(epoch, last_complete);
     }
   };
-  struct C_OSD_CompletedPull : public Context {
-    ReplicatedPGRef pg;
-    hobject_t hoid;
-    epoch_t epoch;
-    C_OSD_CompletedPull(
-      ReplicatedPG *pg,
-      const hobject_t &hoid,
-      epoch_t epoch) : pg(pg), hoid(hoid), epoch(epoch) {}
-    void finish(int) {
-    }
-  };
-  friend struct C_OSD_CompletedPull;
   struct C_OSD_AppliedRecoveredObjectReplica : public Context {
     ReplicatedPGRef pg;
     C_OSD_AppliedRecoveredObjectReplica(ReplicatedPG *p) :