Skip to content

Small for-loop cleanup #120131

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

Closed
DiannaHohensee wants to merge 2 commits into from
Closed

Small for-loop cleanup #120131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
160d763
Small for-loop cleanup
DiannaHohensee Jan 14, 2025
7b356d4
[CI] Auto commit changes from spotless
Jan 14, 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
15 changes: 6 additions & 9 deletions ...java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,19 @@ void run() {
}

private void updateDesireBalanceMetrics(AllocationStats allocationStats) {
var nodesStatsAndWeights = nodeAllocationStatsAndWeightsCalculator.nodesAllocationStatsAndWeights(
var nodeIDsToStatsAndWeights = nodeAllocationStatsAndWeightsCalculator.nodesAllocationStatsAndWeights(
allocation.metadata(),
allocation.routingNodes(),
allocation.clusterInfo(),
desiredBalance
);
Map<DiscoveryNode, NodeAllocationStatsAndWeight> filteredNodeAllocationStatsAndWeights = new HashMap<>(
nodesStatsAndWeights.size()
);
for (var nodeStatsAndWeight : nodesStatsAndWeights.entrySet()) {
Map<DiscoveryNode, NodeAllocationStatsAndWeight> nodeToStatsAndWeights = new HashMap<>(nodeIDsToStatsAndWeights.size());
for (var nodeStatsAndWeight : nodeIDsToStatsAndWeights.entrySet()) {
var node = allocation.nodes().get(nodeStatsAndWeight.getKey());
if (node != null) {
filteredNodeAllocationStatsAndWeights.put(node, nodeStatsAndWeight.getValue());
}
Comment on lines -188 to -190
Copy link
Contributor

@mhl-b mhl-b Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nodesAllocationStatsAndWeights uses RoutingNodes, but RoutingNode can have at most one DiscoveryNode or null (I'm looking at Nullable node property). Potentially allocation.nodes().get(nodeStatsAndWeight.getKey()); might return null when RoutingNode does not have DiscoveryNode specified, right?

Copy link
Contributor Author

@DiannaHohensee DiannaHohensee Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into it. Following the allocation.routingNodes() and allocation.nodes() methods down, it looks like the routing nodes are instantiated here. It looks reasonable that the routing nodes has all of the nodes, from this code, but there are no interface guarantees that I see to feel good about that conclusion..

Looks like the Nullable was added in this commit, probably as a performance edge case.

Eh. I feel like it should have all the nodes, but also there are no guarantees around that, so this change probably isn't safe as the RoutingNodes code is today.

Copy link
Contributor

@mhl-b mhl-b Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to pursue this PR or close it?

assert node != null;
nodeToStatsAndWeights.put(node, nodeStatsAndWeight.getValue());
}
desiredBalanceMetrics.updateMetrics(allocationStats, desiredBalance.weightsPerNode(), filteredNodeAllocationStatsAndWeights);
desiredBalanceMetrics.updateMetrics(allocationStats, desiredBalance.weightsPerNode(), nodeToStatsAndWeights);
}

private boolean allocateUnassignedInvariant() {
Expand Down