Skip to content

Commit 87bd2eb

Browse files
Fix NullPointerException in SystemIndexMetadataUpgradeService hidden alias handling (#84780)
* Fix an NPE in hidden alias logic * Update docs/changelog/84780.yaml * Simplify conditional
1 parent 5f06b5f commit 87bd2eb

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

docs/changelog/84780.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pr: 84780
2+
summary: Fix `NullPointerException` in `SystemIndexMetadataUpgradeService` hidden
3+
alias handling
4+
area: Infra/Core
5+
type: bug
6+
issues:
7+
- 81411

server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ public ClusterState execute(ClusterState currentState) throws Exception {
106106
builder.settings(Settings.builder().put(indexMetadata.getSettings()).put(IndexMetadata.SETTING_INDEX_HIDDEN, true));
107107
updated = true;
108108
}
109-
if (isSystem && indexMetadata.getAliases().values().stream().anyMatch(a -> a.isHidden() == false)) {
109+
if (isSystem && indexMetadata.getAliases().values().stream().anyMatch(a -> Boolean.FALSE.equals(a.isHidden()))) {
110110
for (AliasMetadata aliasMetadata : indexMetadata.getAliases().values()) {
111-
if (aliasMetadata.isHidden() == false) {
111+
if (Boolean.FALSE.equals(aliasMetadata.isHidden())) {
112112
builder.removeAlias(aliasMetadata.alias());
113113
builder.putAlias(
114114
AliasMetadata.builder(aliasMetadata.alias())

x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public void testSingleDoc() throws IOException {
9898
assertThat(toStr(client().performRequest(getRequest)), containsString(doc));
9999
}
100100

101-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/81411")
102101
public void testSecurityNativeRealm() throws Exception {
103102
if (isRunningAgainstOldCluster()) {
104103
createUser(true);

0 commit comments

Comments
 (0)