]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: evict blindly if there is no hit_set
authorSage Weil <sage@redhat.com>
Thu, 31 Jul 2014 16:26:03 +0000 (09:26 -0700)
committerSage Weil <sage@redhat.com>
Thu, 31 Jul 2014 18:03:18 +0000 (11:03 -0700)
If there is no hit set for a PG, blindly evict objects.  This avoids an
assert(hit_set) in agent_estimate_atime_temp().

Fixes: #8982
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/ReplicatedPG.cc

index 393e7089fc83bab2eac86737bd9a15e2c7cf386e..9f25facd1a4dbfa05016ce292b6260feab87a2eb 100644 (file)
@@ -11343,7 +11343,8 @@ bool ReplicatedPG::agent_maybe_evict(ObjectContextRef& obc)
     }
   }
 
-  if (agent_state->evict_mode != TierAgentState::EVICT_MODE_FULL) {
+  if (agent_state->evict_mode != TierAgentState::EVICT_MODE_FULL &&
+      hit_set) {
     // is this object old and/or cold enough?
     int atime = -1, temp = 0;
     agent_estimate_atime_temp(soid, &atime, NULL /*FIXME &temp*/);