Fix NullPointerException in SystemIndexMetadataUpgradeService hidden alias handling#84780
Merged
williamrandolph merged 5 commits intoelastic:masterfrom Mar 9, 2022
Merged
Conversation
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
Collaborator
|
Hi @williamrandolph, I've created a changelog YAML for you. |
rjernst
approved these changes
Mar 8, 2022
Member
rjernst
left a comment
There was a problem hiding this comment.
I don't know why AliasMetadata allows isHidden to be null, but this change does look like it should protect from null here.
| .anyMatch(a -> Objects.nonNull(a.isHidden()) && a.isHidden() == false)) { | ||
| for (AliasMetadata aliasMetadata : indexMetadata.getAliases().values()) { | ||
| if (aliasMetadata.isHidden() == false) { | ||
| if (Objects.nonNull(aliasMetadata.isHidden()) && aliasMetadata.isHidden() == false) { |
Member
There was a problem hiding this comment.
another way to write this, without a compound expression, would be:
if (Boolean.FALSE.equals(aliasMetadata.isHidden())) {
williamrandolph
added a commit
to williamrandolph/elasticsearch
that referenced
this pull request
Mar 9, 2022
…alias handling (elastic#84780) * Fix an NPE in hidden alias logic * Update docs/changelog/84780.yaml * Simplify conditional
Collaborator
williamrandolph
added a commit
to williamrandolph/elasticsearch
that referenced
this pull request
Mar 9, 2022
…alias handling (elastic#84780) * Fix an NPE in hidden alias logic * Update docs/changelog/84780.yaml * Simplify conditional
This was referenced Mar 10, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
There was a mysterious failure in an upgrade test. Examining the logs, I found a NullPointerException that wasn't revealed in the test failure message. Fixing the NPE fixed the test.
Should the
AliasMetadata#isHiddenmethod be nullable? I can't remember why it was written that way, but I can dig if there are any concerns about this fix.Fixes #81411