test fix

Author: mhl-b

server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java

@@ -232,9 +232,10 @@ private Decision withDeciders(
                 if (logger.isTraceEnabled() && decision.type() == Decision.Type.NO) {
                     logger.trace(() -> logMessageCreator.apply(decider.getClass().getSimpleName(), decision));
                 }
-                if (decision != Decision.ALWAYS && (debugMode == RoutingAllocation.DebugMode.ON || decision.type() != Decision.Type.YES)) {
-                    result.add(decision);
-                } else if (decision.preferred() == Decision.Preferred.NO) {
+                if (decision != Decision.ALWAYS
+                    && (debugMode == RoutingAllocation.DebugMode.ON
+                        || decision.type() != Decision.Type.YES
+                        || decision.preferred() != Decision.Preferred.YES)) {
                     result.add(decision);
                 }
             }

server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java

@@ -253,10 +253,11 @@ public String getExplanation() {
 
         @Override
         public String toString() {
+            var preference = type == Type.YES && preferred == Preferred.NO ? "_NOT_PREFERRED": "";
             if (explanationString != null) {
-                return type + "(" + explanationString + ")";
+                return type + preference + "(" + explanationString + ")";
             }
-            return type + "()";
+            return type + preference + "()";
         }
 
         @Override
@@ -316,12 +317,16 @@ public Type type() {
 
         @Override
         public Preferred preferred() {
+            var preferred = Preferred.YES;
             for (var decision : decisions) {
-                if (decision.preferred() == Preferred.NO) {
+                if (decision.type() != Type.YES) {
                     return Preferred.NO;
                 }
+                if (decision.preferred() == Preferred.NO) {
+                    preferred = Preferred.NO;
+                }
             }
-            return Preferred.YES;
+            return preferred;
         }
 
         @Override

server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java

@@ -60,13 +60,14 @@ public void testCheckAllDecidersBeforeReturningYesNotPreferred() {
         var allDecisions = generateDecisions(Decision.YES_NOT_PREFERRED, () -> randomFrom(Decision.YES));
         var expectedDecision = switch (debugMode) {
             case OFF -> Decision.YES_NOT_PREFERRED;
-            case EXCLUDE_YES_DECISIONS, ON -> collectToMultiDecision(List.of(Decision.YES_NOT_PREFERRED));
+            case EXCLUDE_YES_DECISIONS -> collectToMultiDecision(allDecisions, decision -> decision.preferred() != Decision.Preferred.YES);
+            case ON -> collectToMultiDecision(allDecisions);
         };
         verifyDecidersCall(debugMode, allDecisions, allDecisions.size(), expectedDecision);
     }
 
     public void testCheckAllDecidersBeforeReturningThrottle() {
-        var allDecisions = generateDecisions(Decision.THROTTLE, () -> randomFrom(Decision.YES, Decision.YES_NOT_PREFERRED));
+        var allDecisions = generateDecisions(Decision.THROTTLE, () -> randomFrom(Decision.YES));
         var debugMode = randomFrom(RoutingAllocation.DebugMode.values());
         var expectedDecision = switch (debugMode) {
             case OFF -> Decision.THROTTLE;