Merge pull request ceph#13090 from dzafman/wip-18624

Revert "PrimaryLogPG::failed_push: update missing as well" Reviewed-by: Samuel Just <[email protected]> Reviewed-by: Kefu Chai <[email protected]>
zmc · Jan 25, 2017 · 61b345e · 61b345e
2 parents 2e6ba82 + 1642add
commit 61b345e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/osd/PG.h b/src/osd/PG.h
@@ -436,12 +436,6 @@ class PG : protected DoutPrefixProvider {
       ThreadPool::TPHandle* handle  ///< [in] ThreadPool handle
       );
 
-    /// Returns version needed
-    eversion_t get_version_needed(const hobject_t &hoid) const {
-      assert(needs_recovery_map.count(hoid));
-      return needs_recovery_map.at(hoid).need;
-    }
-
     /// Uses osdmap to update structures for now down sources
     void check_recovery_sources(const OSDMapRef& osdmap);
 

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
@@ -9546,12 +9546,8 @@ void PrimaryLogPG::failed_push(const list<pg_shard_t> &from, const hobject_t &so
     requeue_ops(blocked_ops);
   }
   recovering.erase(soid);
-  for (auto&& i : from) {
+  for (auto&& i : from)
     missing_loc.remove_location(soid, i);
-    auto miter = peer_missing.find(i);
-    assert(miter != peer_missing.end());
-    miter->second.add(soid, missing_loc.get_version_needed(soid), eversion_t());
-  }
   dout(0) << __func__ << " " << soid << " from shard " << from
 	  << ", reps on " << missing_loc.get_locations(soid)
 	  << " unfound? " << missing_loc.is_unfound(soid) << dendl;