From: Sage Weil <sage@inktank.com>
Date: Tue, 28 Jan 2014 02:14:09 +0000 (-0800)
Subject: osd/ReplicatedPG: fix evict mode selection for large target
X-Git-Tag: v0.78~166^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e07f987d9fd5b5f6260bf981b60a9db30f5c2d73;p=ceph.git

osd/ReplicatedPG: fix evict mode selection for large target

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>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d06f0c3dda20..1c4a0ecb5c23 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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;