summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-09-24 16:17:33 -0700
committerSamuel Just <sam.just@inktank.com>2013-09-26 11:24:28 -0700
commit07905af8ff12a6bea8cbff454e17c8d79e1a0178 (patch)
tree917aa602aa08aa040a4bbed9a9a2bdc15511aba2
parent2bc1e38c1c46be9575f06bd1a19c1675aa1821f8 (diff)
downloadceph-07905af8ff12a6bea8cbff454e17c8d79e1a0178.tar.gz
ReplicatedPG: remove noop C_OSD_CompletedPull
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/ReplicatedPG.cc2
-rw-r--r--src/osd/ReplicatedPG.h12
2 files changed, 0 insertions, 14 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 9c9b4fb6bb9..f1155a0f897 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 05fbe0fa792..e24592e932f 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) :