Skip to content
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

Jump to bottom

Avoid NPE when disassociateDeadNodes is executed for a node present in the desired balance #91659

Merged
merged 9 commits into from Nov 18, 2022
Merged

Avoid NPE when disassociateDeadNodes is executed for a node present in the desired balance #91659

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d45e253
Avoid NPE when disassociateDeadNodes
idegtiarenko Nov 17, 2022
21d3771
Update docs/changelog/91659.yaml
idegtiarenko Nov 17, 2022
c9e01ff
update issue yaml
idegtiarenko Nov 17, 2022
3b22560
add unit test
idegtiarenko Nov 18, 2022
a8b335f
Update docs/changelog/91659.yaml
idegtiarenko Nov 18, 2022
ddd5f66
cleanup
idegtiarenko Nov 18, 2022
f37372d
fmt
idegtiarenko Nov 18, 2022
92bca37
Merge branch 'main' into fix_reconciliation
idegtiarenko Nov 18, 2022
3917ec7
fix comments
idegtiarenko Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 11 additions & 7 deletions ...java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconciler.java
View file
Open in desktop
Expand Up @@ -415,13 +415,17 @@ private DiscoveryNode findRelocationTarget(
) {
for (final var nodeId : desiredNodeIds) {
// TODO consider ignored nodes here too?
if (nodeId.equals(shardRouting.currentNodeId()) == false) {
final var currentNode = routingNodes.node(nodeId);
final var decision = canAllocateDecider.apply(shardRouting, currentNode);
logger.trace("relocate {} to {}: {}", shardRouting, nodeId, decision);
if (decision.type() == Decision.Type.YES) {
return currentNode.node();
}
if (nodeId.equals(shardRouting.currentNodeId())) {
continue;
}
final var node = routingNodes.node(nodeId);
if (node == null) { // node theft the cluster while reconciliation is still in progress
idegtiarenko marked this conversation as resolved.
Show resolved Hide resolved
continue;
idegtiarenko marked this conversation as resolved.
Show resolved Hide resolved
}
final var decision = canAllocateDecider.apply(shardRouting, node);
logger.trace("relocate {} to {}: {}", shardRouting, nodeId, decision);
if (decision.type() == Decision.Type.YES) {
return node.node();
}
}

Expand Down