From e35d66c6bbf40c65922ef758432375655772df6b Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 27 Apr 2017 14:51:13 -0700 Subject: [PATCH] osd: cleanup: Rename _failed_push to _failed_pull for ReplicatedBackend Signed-off-by: David Zafman --- src/osd/ReplicatedBackend.cc | 5 +++-- src/osd/ReplicatedBackend.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 07c0d316cf6..6a63f5415f1 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -1723,7 +1723,7 @@ bool ReplicatedBackend::handle_pull_response( << dendl; if (pop.version == eversion_t()) { // replica doesn't have it! - _failed_push(from, pop.soid); + _failed_pull(from, pop.soid); return false; } @@ -2183,8 +2183,9 @@ void ReplicatedBackend::trim_pushed_data( } } -void ReplicatedBackend::_failed_push(pg_shard_t from, const hobject_t &soid) +void ReplicatedBackend::_failed_pull(pg_shard_t from, const hobject_t &soid) { + dout(20) << __func__ << ": " << soid << " from " << from << dendl; list fl = { from }; get_parent()->failed_push(fl, soid); diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index 55966325f54..0b949cac64a 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -255,7 +255,7 @@ private: bufferlist data_received, interval_set *intervals_usable, bufferlist *data_usable); - void _failed_push(pg_shard_t from, const hobject_t &soid); + void _failed_pull(pg_shard_t from, const hobject_t &soid); void send_pushes(int prio, map > &pushes); void prep_push_op_blank(const hobject_t& soid, PushOp *op); -- 2.47.3