Merge pull request #3949 from dachary/wip-9915-firefly

osd: cache tiering: fix the atime logic of the eviction Reviewed-by: Samuel Just <sjust@redhat.com>
ceph · Mar 16, 2015 · 45f0870 · 45f0870
2 parents 3050262 + 6207333
commit 45f0870
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -11433,8 +11433,7 @@ bool ReplicatedPG::agent_maybe_evict(ObjectContextRef& obc)
 
     // FIXME: ignore temperature for now.
 
-    // KISS: if [lower,upper] spans our target effort, evict it.
-    if (atime_lower >= agent_state->evict_effort)
+    if (1000000 - atime_upper >= agent_state->evict_effort)
       return false;
   }