Fix NullPointerException in SystemIndexMetadataUpgradeService hidden …

…alias handling (#84780) (#84833) * Fix an NPE in hidden alias logic * Update docs/changelog/84780.yaml * Simplify conditional
elastic · Mar 9, 2022 · 861bd0e · 861bd0e
1 parent d8d7880
commit 861bd0e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/docs/changelog/84780.yaml b/docs/changelog/84780.yaml
@@ -0,0 +1,7 @@
+pr: 84780
+summary: Fix `NullPointerException` in `SystemIndexMetadataUpgradeService` hidden
+  alias handling
+area: Infra/Core
+type: bug
+issues:
+ - 81411
diff --git a/...r/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java b/...r/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java
@@ -100,9 +100,9 @@ public ClusterState execute(ClusterState currentState) throws Exception {
                         builder.settings(Settings.builder().put(indexMetadata.getSettings()).put(IndexMetadata.SETTING_INDEX_HIDDEN, true));
                         updated = true;
                     }
-                    if (isSystem && indexMetadata.getAliases().values().stream().anyMatch(a -> a.isHidden() == false)) {
+                    if (isSystem && indexMetadata.getAliases().values().stream().anyMatch(a -> Boolean.FALSE.equals(a.isHidden()))) {
                         for (AliasMetadata aliasMetadata : indexMetadata.getAliases().values()) {
-                            if (aliasMetadata.isHidden() == false) {
+                            if (Boolean.FALSE.equals(aliasMetadata.isHidden())) {
                                 builder.removeAlias(aliasMetadata.alias());
                                 builder.putAlias(
                                     AliasMetadata.builder(aliasMetadata.alias())

diff --git a/...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java b/...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
@@ -98,7 +98,6 @@ public void testSingleDoc() throws IOException {
         assertThat(toStr(client().performRequest(getRequest)), containsString(doc));
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/81411")
     public void testSecurityNativeRealm() throws Exception {
         if (isRunningAgainstOldCluster()) {
             createUser(true);