]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: fix evict mode selection for large target
authorSage Weil <sage@inktank.com>
Tue, 28 Jan 2014 02:14:09 +0000 (18:14 -0800)
committerSage Weil <sage@inktank.com>
Sun, 16 Feb 2014 06:09:39 +0000 (22:09 -0800)
If the target is > 1.0 for some reason (bad configuration, or high slop
value), and we are not yet full, we should be in IDLE mode--not SOME.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index d06f0c3dda203550362a497a49e1923726be8478..1c4a0ecb5c2340e7c80f4ff0af29a802a8ee8e09 100644 (file)
@@ -10476,8 +10476,7 @@ bool ReplicatedPG::agent_choose_mode()
   else
     evict_target -= MIN(evict_target, evict_slop);
 
-  if (full_micro > 1000000 ||
-      evict_target >= 1000000) {
+  if (full_micro > 1000000) {
     // evict anything clean
     evict_mode = TierAgentState::EVICT_MODE_FULL;
     evict_effort = 1000000;