Fix NPE in Desired Balance API #97775
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
If a shard has no desired assignment then we cannot send the desired balance over the wire or render it as JSON because the `ShardAssignmentView` is `null`. This commit replaces the spurious `null` with an empty object, and cleans up the tests a little to remove some unnecessary mocking.
DaveCTurner added >bug :Distributed Coordination/Allocation 
elasticsearchmachine added the Team:Distributed (Obsolete) 
| Pinging @elastic/es-distributed (Team:Distributed) |
| Hi @DaveCTurner, I've created a changelog YAML for you. |
| assertEquals(shardAssignment.get().unassigned(), desiredShard.desired().unassigned()); | ||
| assertEquals(shardAssignment.get().ignored(), desiredShard.desired().ignored()); | ||
| final var shardAssignment = shardAssignments.get(indexShardRoutingTable.shardId()); | ||
| if (shardAssignment == null) { |
There was a problem hiding this comment.
Is this test generating null assignments?
There was a problem hiding this comment.
Yes it only assigns some random subset of the shards.
idegtiarenko approved these changes Jul 19, 2023
DaveCTurner added auto-merge-without-approval slobodanadamovic pushed a commit to slobodanadamovic/elasticsearch that referenced this pull request Jul 19, 2023
If a shard has no desired assignment then we cannot send the desired balance over the wire or render it as JSON because the `ShardAssignmentView` is `null`. This commit replaces the spurious `null` with an empty object, and cleans up the tests a little to remove some unnecessary mocking.
| I'm confused, this is apparently merged at 1ef7d3f but this PR is still open. |
💔 Backport failedYou can use sqren/backport to manually backport by running |
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Jul 19, 2023
If a shard has no desired assignment then we cannot send the desired balance over the wire or render it as JSON because the `ShardAssignmentView` is `null`. This commit replaces the spurious `null` with an empty object, and cleans up the tests a little to remove some unnecessary mocking.
DaveCTurner removed auto-merge-without-approval elasticsearchmachine pushed a commit that referenced this pull request Jul 19, 2023
If a shard has no desired assignment then we cannot send the desired balance over the wire or render it as JSON because the `ShardAssignmentView` is `null`. This commit replaces the spurious `null` with an empty object, and cleans up the tests a little to remove some unnecessary mocking.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
If a shard has no desired assignment then we cannot send the desired
balance over the wire or render it as JSON because the
ShardAssignmentViewisnull. This commit replaces the spuriousnullwith an empty object, and cleans up the tests a little to removesome unnecessary mocking.