fix to throw appropriate error message

Signed-off-by: srikanth padakanti <srikanth29.9@gmail.com>
opensearch-project · Apr 18, 2024 · f7a1951 · f7a1951
1 parent 51ed18f
commit f7a1951
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...nk-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java b/...nk-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java
@@ -345,7 +345,7 @@ public void testIndicesOptions() {
         request.indicesOptions(IndicesOptions.fromParameters("closed", null, null, "false", SearchRequest.DEFAULT_INDICES_OPTIONS));
         response = client().execute(RankEvalAction.INSTANCE, request).actionGet();
         assertEquals(1, response.getFailures().size());
-        assertThat(response.getFailures().get("amsterdam_query"), instanceOf(IllegalArgumentException.class));
+        assertThat(response.getFailures().get("amsterdam_query"), instanceOf(IndexClosedException.class));
 
         // test allow_no_indices
         request = new RankEvalRequest(task, new String[] { "bad*" });

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java
@@ -380,7 +380,7 @@ private void checkSystemIndexAccess(Context context, Metadata metadata, Set<Inde
     private static boolean shouldTrackConcreteIndex(Context context, IndicesOptions options, IndexMetadata index) {
         if (index.getState() == IndexMetadata.State.CLOSE) {
             if (options.forbidClosedIndices() && options.ignoreUnavailable() == false) {
-                if (options.expandWildcardsClosed() == true) {
+                if (options.expandWildcardsClosed() == true && options.getExpandWildcards().size() == 1) {
                     throw new IllegalArgumentException(
                         "To expand [" + index.getState() + "] wildcard, please set forbid_closed_indices to `false`"
                     );