Revert "PrimaryLogPG::failed_push: update missing as well"

This reverts commit dd48b972afde2dfa9ab1a6942c7961750222986d.

Fixes: http://tracker.ceph.com/issues/18624
Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 6c5c98016657fa4e41ec823e0c456b372df27672..607fadad7039016b3c0722ec521ea142190c6668 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -436,12 +436,6 @@ public:
       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
index bea380ce4e3c6d41140a04fc300be79f3453d034..cfd88d4b5684f09faac0b96fcecf22e0089ad9cf 100644 (file)
--- 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;