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 b705ae22f3a08ac276dddd110744fa906fd75ebe..a49a2ff2f2a9a152c7d245fa173b2594b9eddf6b 100644 (file)
--- 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;
   }