handle closed index for getmappings

jakelandis · Oct 3, 2023 · 7d2c037 · 7d2c037
1 parent 4df0815
commit 7d2c037
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java b/...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
@@ -297,7 +297,10 @@ public void getRoleMappings(Set<String> names, ActionListener<List<ExpressionRol
     private void getMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
         final SecurityIndexManager frozenSecurityIndex = securityIndex.defensiveCopy();
         if (frozenSecurityIndex.indexExists() == false) {
-            logger.debug("The security index exists - no role mappings can be loaded");
+            logger.debug("The security does not index exist - no role mappings can be loaded");
+            listener.onResponse(Collections.emptyList());
+        } else if (frozenSecurityIndex.indexIsClosed()) {
+            logger.debug("The security index exists but is closed - no role mappings can be loaded");
             listener.onResponse(Collections.emptyList());
         } else if (frozenSecurityIndex.isAvailable(SEARCH_SHARDS) == false) {
             logger.debug("The security index exists but is not available - no role mappings can be loaded");

diff --git a/...security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java b/...security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java
@@ -117,6 +117,10 @@ public boolean indexExists() {
         return this.state.indexExists();
     }
 
+    public boolean indexIsClosed() {
+        return this.state.indexState == IndexMetadata.State.CLOSE;
+    }
+
     public Instant getCreationTime() {
         return this.state.creationTime;
     }