From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Nov 2015 19:40:26 +0000 (-0500)
Subject: osd: recency should look at newest (not oldest) hitsets
X-Git-Tag: v0.94.6~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7207%2Fhead;p=ceph.git

osd: recency should look at newest (not oldest) hitsets

Reported-by: xinxin shu <xinxin.shu@intel.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 528eae92d010ea34ae8cf0e8b2290aaa5e058d24)

Conflicts:
	src/osd/ReplicatedPG.cc
                    code section was moved to ReplicatedPG::maybe_promote
                    in master.
Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index bfaa16bb9b4..897a77cc633 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1860,8 +1860,9 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
       if (count) {
 	// Check if in other hit sets
 	const hobject_t& oid = obc.get() ? obc->obs.oi.soid : missing_oid;
-	for (map<time_t,HitSetRef>::iterator itor = agent_state->hit_set_map.begin();
-	     itor != agent_state->hit_set_map.end();
+	for (map<time_t,HitSetRef>::reverse_iterator itor =
+	       agent_state->hit_set_map.rbegin();
+	     itor != agent_state->hit_set_map.rend();
 	     ++itor) {
 	  if (!itor->second->contains(oid)) {
 	    break;