From: Samuel Just <sjust@redhat.com>
Date: Mon, 30 Mar 2015 20:22:26 +0000 (-0700)
Subject: ReplicatedPG: requeue waiting_for_active before waiting_for_cache_not_full
X-Git-Tag: v0.94~9^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1f078bc22c40f8937c10e8587d85b1e3ceeff6a;p=ceph.git

ReplicatedPG: requeue waiting_for_active before waiting_for_cache_not_full

The waiting_for_cache_not_full waiters must be dequeued first.

Fixes: 11267
Backport: firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index b705ae22f3a0..a49a2ff2f2a9 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11011,8 +11011,8 @@ void ReplicatedPG::agent_choose_mode(bool restart)
 	    << dendl;
     if (agent_state->evict_mode == TierAgentState::EVICT_MODE_FULL &&
 	is_active()) {
-      requeue_ops(waiting_for_cache_not_full);
       requeue_ops(waiting_for_active);
+      requeue_ops(waiting_for_cache_not_full);
     }
     agent_state->evict_mode = evict_mode;
   }