]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: cleanup: Rename _failed_push to _failed_pull for ReplicatedBackend
authorDavid Zafman <dzafman@redhat.com>
Thu, 27 Apr 2017 21:51:13 +0000 (14:51 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 23 Jun 2017 15:02:51 +0000 (08:02 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedBackend.h

index 07c0d316cf6d1e69dc8c0e29e0e273ef4416d2ad..6a63f5415f1ceb41fd14224cc57007d2a4d10c96 100644 (file)
@@ -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<pg_shard_t> fl = { from };
   get_parent()->failed_push(fl, soid);
 
index 55966325f54c6e0a9a025c1146ca9bee8663feb7..0b949cac64a8a19046fbd2f22ed2514c69c45acb 100644 (file)
@@ -255,7 +255,7 @@ private:
                               bufferlist data_received,
                               interval_set<uint64_t> *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<pg_shard_t, vector<PushOp> > &pushes);
   void prep_push_op_blank(const hobject_t& soid, PushOp *op);