From 1642adda320de2c4094cd7cb2be0ebae9c1bf32b Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 24 Jan 2017 16:30:24 -0800 Subject: [PATCH] Revert "PrimaryLogPG::failed_push: update missing as well" This reverts commit dd48b972afde2dfa9ab1a6942c7961750222986d. Fixes: http://tracker.ceph.com/issues/18624 Signed-off-by: David Zafman --- src/osd/PG.h | 6 ------ src/osd/PrimaryLogPG.cc | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/osd/PG.h b/src/osd/PG.h index 6c5c9801665..607fadad703 100644 --- 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 bea380ce4e3..cfd88d4b568 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -9546,12 +9546,8 @@ void PrimaryLogPG::failed_push(const list &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; -- 2.47.3