Skip to content

Commit f7562a1

Browse files
DiannaHohenseeDiannaHohensee
committed
undo canRemainYes to canRemain
1 parent 8df6adc commit f7562a1

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ public void testAllocationFilteringPreventsShardMove() throws Exception {
538538
assertTrue(moveDecision.isDecisionTaken());
539539
assertEquals(AllocationDecision.NO, moveDecision.getAllocationDecision());
540540
assertEquals(Explanations.Move.NO, moveDecision.getExplanation());
541-
assertFalse(moveDecision.canRemainYes());
541+
assertFalse(moveDecision.canRemain());
542542
assertFalse(moveDecision.cannotRemainAndCanMove());
543543
assertFalse(moveDecision.canRebalanceCluster());
544544
assertNull(moveDecision.getClusterRebalanceDecision());
@@ -651,7 +651,7 @@ public void testRebalancingNotAllowed() throws Exception {
651651
assertTrue(moveDecision.isDecisionTaken());
652652
assertEquals(AllocationDecision.NO, moveDecision.getAllocationDecision());
653653
assertEquals(Explanations.Rebalance.CANNOT_REBALANCE_CAN_ALLOCATE, moveDecision.getExplanation());
654-
assertTrue(moveDecision.canRemainYes());
654+
assertTrue(moveDecision.canRemain());
655655
assertFalse(moveDecision.cannotRemainAndCanMove());
656656
assertFalse(moveDecision.canRebalanceCluster());
657657
assertNotNull(moveDecision.getCanRemainDecision());
@@ -757,7 +757,7 @@ public void testWorseBalance() throws Exception {
757757
assertTrue(moveDecision.isDecisionTaken());
758758
assertEquals(AllocationDecision.NO, moveDecision.getAllocationDecision());
759759
assertEquals(Explanations.Rebalance.ALREADY_BALANCED, moveDecision.getExplanation());
760-
assertTrue(moveDecision.canRemainYes());
760+
assertTrue(moveDecision.canRemain());
761761
assertFalse(moveDecision.cannotRemainAndCanMove());
762762
assertTrue(moveDecision.canRebalanceCluster());
763763
assertNotNull(moveDecision.getCanRemainDecision());
@@ -855,7 +855,7 @@ public void testBetterBalanceButCannotAllocate() throws Exception {
855855
assertTrue(moveDecision.isDecisionTaken());
856856
assertEquals(AllocationDecision.NO, moveDecision.getAllocationDecision());
857857
assertEquals(Explanations.Rebalance.ALREADY_BALANCED, moveDecision.getExplanation());
858-
assertTrue(moveDecision.canRemainYes());
858+
assertTrue(moveDecision.canRemain());
859859
assertFalse(moveDecision.cannotRemainAndCanMove());
860860
assertTrue(moveDecision.canRebalanceCluster());
861861
assertNotNull(moveDecision.getCanRemainDecision());
@@ -963,7 +963,7 @@ public void testAssignedReplicaOnSpecificNode() throws Exception {
963963
assertTrue(moveDecision.isDecisionTaken());
964964
assertEquals(AllocationDecision.NO, moveDecision.getAllocationDecision());
965965
assertEquals(Explanations.Rebalance.CANNOT_REBALANCE_CANNOT_ALLOCATE, moveDecision.getExplanation());
966-
assertTrue(moveDecision.canRemainYes());
966+
assertTrue(moveDecision.canRemain());
967967
assertFalse(moveDecision.cannotRemainAndCanMove());
968968
assertFalse(moveDecision.canRebalanceCluster());
969969
assertNotNull(moveDecision.getCanRemainDecision());

‎server/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public boolean isDecisionTaken() {
152152
*/
153153
public boolean cannotRemainAndCanMove() {
154154
checkDecisionState();
155-
return canRemainYes() == false && canMoveDecision == AllocationDecision.YES;
155+
return canRemain() == false && canMoveDecision == AllocationDecision.YES;
156156
}
157157

158158
/**
@@ -169,7 +169,7 @@ public boolean cannotRemainAndCannotMove() {
169169
* Returns {@code true} if the shard can remain on its current node, returns {@code false} otherwise.
170170
* If {@link #isDecisionTaken()} returns {@code false}, then invoking this method will throw an {@code IllegalStateException}.
171171
*/
172-
public boolean canRemainYes() {
172+
public boolean canRemain() {
173173
checkDecisionState();
174174
return canRemainDecision.type() == Type.YES;
175175
}
@@ -197,7 +197,7 @@ public boolean canRebalanceCluster() {
197197

198198
/**
199199
* Returns the decision for being allowed to rebalance the shard. Invoking this method will return
200-
* {@code null} if {@link #canRemainYes()} ()} returns {@code false}, which means the node is not allowed to
200+
* {@code null} if {@link #canRemain()} ()} returns {@code false}, which means the node is not allowed to
201201
* remain on its current node, so the cluster is forced to attempt to move the shard to a different node,
202202
* as opposed to attempting to rebalance the shard if a better cluster balance is possible by moving it.
203203
* If {@link #isDecisionTaken()} returns {@code false}, then invoking this method will throw an
@@ -256,7 +256,7 @@ public String getExplanation() {
256256
};
257257
} else {
258258
// it was a decision to force move the shard
259-
assert canRemainYes() == false;
259+
assert canRemain() == false;
260260
return switch (canMoveDecision) {
261261
case YES -> Explanations.Move.YES;
262262
case THROTTLED -> Explanations.Move.THROTTLED;
@@ -278,8 +278,8 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params params
278278
discoveryNodeToXContent(targetNode, true, builder);
279279
builder.endObject();
280280
}
281-
builder.field("can_remain_on_current_node", canRemainYes() ? "yes" : "no");
282-
if (canRemainYes() == false && canRemainDecision.getDecisions().isEmpty() == false) {
281+
builder.field("can_remain_on_current_node", canRemain() ? "yes" : "no");
282+
if (canRemain() == false && canRemainDecision.getDecisions().isEmpty() == false) {
283283
builder.startArray("can_remain_decisions");
284284
canRemainDecision.toXContent(builder, params);
285285
builder.endArray();

‎server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public ShardAllocationDecision decideShardAllocation(final ShardRouting shard, f
257257
allocateUnassignedDecision = balancer.decideAllocateUnassigned(index, shard);
258258
} else {
259259
moveDecision = balancer.decideMove(index, shard);
260-
if (moveDecision.isDecisionTaken() && moveDecision.canRemainYes()) {
260+
if (moveDecision.isDecisionTaken() && moveDecision.canRemain()) {
261261
moveDecision = balancer.decideRebalance(index, shard, moveDecision.getCanRemainDecision());
262262
}
263263
}
@@ -829,7 +829,7 @@ public boolean moveShards() {
829829
}
830830
shardMoved = true;
831831
}
832-
} else if (moveDecision.isDecisionTaken() && moveDecision.canRemainYes() == false) {
832+
} else if (moveDecision.isDecisionTaken() && moveDecision.canRemain() == false) {
833833
logger.trace("[{}][{}] can't move", shardRouting.index(), shardRouting.id());
834834
}
835835
}

‎server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ public void testCachedDecisions() {
5858

5959
public void testStayDecision() {
6060
MoveDecision stay = MoveDecision.createMoveDecisionWithRemainYesDecision(Decision.YES);
61-
assertTrue(stay.canRemainYes());
61+
assertTrue(stay.canRemain());
6262
assertFalse(stay.cannotRemainAndCanMove());
6363
assertTrue(stay.isDecisionTaken());
6464
assertNull(stay.getNodeDecisions());
6565
assertEquals(AllocationDecision.NO_ATTEMPT, stay.getAllocationDecision());
6666

6767
stay = MoveDecision.createMoveDecisionWithRemainYesDecision(Decision.YES);
68-
assertTrue(stay.canRemainYes());
68+
assertTrue(stay.canRemain());
6969
assertFalse(stay.cannotRemainAndCanMove());
7070
assertTrue(stay.isDecisionTaken());
7171
assertNull(stay.getNodeDecisions());
@@ -114,7 +114,7 @@ public void testSerialization() throws IOException {
114114
BytesStreamOutput output = new BytesStreamOutput();
115115
moveDecision.writeTo(output);
116116
MoveDecision readDecision = new MoveDecision(output.bytes().streamInput());
117-
assertEquals(moveDecision.canRemainYes(), readDecision.canRemainYes());
117+
assertEquals(moveDecision.canRemain(), readDecision.canRemain());
118118
assertEquals(moveDecision.getExplanation(), readDecision.getExplanation());
119119
assertEquals(moveDecision.cannotRemainAndCanMove(), readDecision.cannotRemainAndCanMove());
120120
assertEquals(moveDecision.getNodeDecisions().size(), readDecision.getNodeDecisions().size());

‎x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ static ShutdownShardMigrationStatus shardMigrationStatus(
285285
.map(shardRouting -> new Tuple<>(shardRouting, allocationService.explainShardAllocation(shardRouting, allocation)))
286286
// Given that we're checking the status of a node that's shutting down, no shards should be allowed to remain
287287
.filter(pair -> {
288-
assert pair.v2().getMoveDecision().canRemainYes() == false
288+
assert pair.v2().getMoveDecision().canRemain() == false
289289
: "shard [" + pair + "] can remain on node [" + nodeId + "], but that node is shutting down";
290-
return pair.v2().getMoveDecision().canRemainYes() == false;
290+
return pair.v2().getMoveDecision().canRemain() == false;
291291
})
292292
// These shards will move as soon as possible
293293
.filter(pair -> pair.v2().getMoveDecision().getAllocationDecision().equals(AllocationDecision.YES) == false)

0 commit comments

Comments
 (0)