Skip to content

Tighten assertions in MoveDecision static method helpers #137403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Tighten assertions in MoveDecision static method helpers #137403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e7ef1
Tighten assertions in MoveDecision static method helpers
DiannaHohensee Oct 30, 2025
ee86469
add debug to assertion
DiannaHohensee Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions server/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ public void writeTo(StreamOutput out) throws IOException {
* be forced to move to another node.
*/
public static MoveDecision createRemainYesDecision(Decision canRemainDecision) {
assert canRemainDecision.type() != Type.NO;
assert canRemainDecision.type() != Type.NOT_PREFERRED;
assert canRemainDecision != null;
assert canRemainDecision.type() == Type.YES
: "Create decision with MoveDecision#move instead. canRemain Decision: " + canRemainDecision;
if (canRemainDecision == Decision.YES) {
return CACHED_STAY_DECISION;
}
Expand All @@ -117,7 +118,8 @@ public static MoveDecision move(
@Nullable List<NodeAllocationResult> nodeDecisions
) {
assert canRemainDecision != null;
assert canRemainDecision.type() != Type.YES : "create decision with MoveDecision#stay instead";
assert canRemainDecision.type() != Type.YES
: "Create decision with MoveDecision#createRemainYesDecision instead. canRemain Decision: " + canRemainDecision;
if (nodeDecisions == null && moveDecision == AllocationDecision.NO) {
// the final decision is NO (no node to move the shard to) and we are not in explain mode, return a cached version
return CACHED_CANNOT_MOVE_DECISION;
Expand Down
17 changes: 9 additions & 8 deletions server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ public void testCachedDecisions() {
assertEquals(stay1.getExplanation(), stay2.getExplanation());
}

public void testMoveDecisionThrowsOnYes() {
assertThrows(AssertionError.class, () -> MoveDecision.move(Decision.YES, AllocationDecision.NO, null, null));
}

public void testStayDecision() {
MoveDecision stay = MoveDecision.createRemainYesDecision(Decision.YES);
assertTrue(stay.canRemain());
Expand All @@ -64,18 +68,15 @@ public void testStayDecision() {
assertNull(stay.getNodeDecisions());
assertEquals(AllocationDecision.NO_ATTEMPT, stay.getAllocationDecision());

stay = MoveDecision.createRemainYesDecision(Decision.YES);
assertTrue(stay.canRemain());
assertFalse(stay.cannotRemainAndCanMove());
assertTrue(stay.isDecisionTaken());
assertNull(stay.getNodeDecisions());
assertEquals(AllocationDecision.NO_ATTEMPT, stay.getAllocationDecision());
assertThrows(AssertionError.class, () -> MoveDecision.createRemainYesDecision(Decision.NO));
assertThrows(AssertionError.class, () -> MoveDecision.createRemainYesDecision(Decision.NOT_PREFERRED));
assertThrows(AssertionError.class, () -> MoveDecision.createRemainYesDecision(Decision.THROTTLE));
}

public void testDecisionWithNodeExplanations() {
DiscoveryNode node1 = DiscoveryNodeUtils.builder("node1").roles(emptySet()).build();
DiscoveryNode node2 = DiscoveryNodeUtils.builder("node2").roles(emptySet()).build();
Decision nodeDecision = randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES);
Decision nodeDecision = randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES, Decision.NOT_PREFERRED);
List<NodeAllocationResult> nodeDecisions = new ArrayList<>();
nodeDecisions.add(new NodeAllocationResult(node1, nodeDecision, 2));
nodeDecisions.add(new NodeAllocationResult(node2, nodeDecision, 1));
Expand All @@ -101,7 +102,7 @@ public void testSerialization() throws IOException {
nodeDecisions.add(
new NodeAllocationResult(
node2,
finalDecision.allowed() ? Decision.YES : randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES),
finalDecision.allowed() ? Decision.YES : randomFrom(Decision.NO, Decision.THROTTLE, Decision.YES, Decision.NOT_PREFERRED),
1
)
);
Expand Down