Fix for closed indices

Author: albertzaharovits

server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java

@@ -409,18 +409,28 @@ Table buildTable(RestRequest request, IndexMetaData[] indicesMetaData, ClusterHe
                 }
             }
 
-            // the index is present in the cluster state but is not returned in the indices stats API
-            if (indexStats == null) {
+            // the open index is present in the cluster state but is not returned in the indices stats API
+            if (indexStats == null && state != IndexMetaData.State.CLOSE) {
                 // the index stats API is called last, after cluster state and cluster health. If the index stats
-                // has not resolved the same indices as the initial cluster state call, then the indices might
+                // has not resolved the same open indices as the initial cluster state call, then the indices might
                 // have been removed in the meantime or, more likely, are unauthorized. This is because the cluster
                 // state exposes everything, even unauthorized indices, which are not exposed in APIs.
                 // We ignore such an index instead of displaying it with an empty stats.
                 continue;
             }
 
-            final CommonStats primaryStats = indexStats.getPrimaries();
-            final CommonStats totalStats = indexStats.getTotal();
+            final CommonStats primaryStats;
+            final CommonStats totalStats;
+
+            if (state == IndexMetaData.State.CLOSE) {
+                // empty stats for closed indices, but their names are displayed
+                assert indexStats == null;
+                primaryStats = new CommonStats();
+                totalStats = new CommonStats();
+            } else {
+                primaryStats = indexStats.getPrimaries();
+                totalStats = indexStats.getTotal();
+            }
 
             table.startRow();
             table.addCell(state == IndexMetaData.State.OPEN ?
@@ -609,8 +619,8 @@ Table buildTable(RestRequest request, IndexMetaData[] indicesMetaData, ClusterHe
             table.addCell(totalStats.getSearch() == null ? null : totalStats.getSearch().getTotal().getSuggestCount());
             table.addCell(primaryStats.getSearch() == null ? null : primaryStats.getSearch().getTotal().getSuggestCount());
 
-            table.addCell(indexStats.getTotal().getTotalMemory());
-            table.addCell(indexStats.getPrimaries().getTotalMemory());
+            table.addCell(totalStats.getTotalMemory());
+            table.addCell(primaryStats.getTotalMemory());
 
             table.addCell(searchThrottled);
 

server/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java

@@ -60,9 +60,9 @@
 import org.elasticsearch.test.rest.FakeRestRequest;
 import org.elasticsearch.usage.UsageService;
 
-import java.lang.reflect.Array;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -189,18 +189,13 @@ private IndicesStatsResponse randomIndicesStatsResponse(final IndexMetaData[] in
         );
     }
 
-    private <T> T[] removeRandomElement(T[] array) {
+    private IndexMetaData[] removeRandomElement(IndexMetaData[] array) {
         assert array != null;
         assert array.length > 0;
-        @SuppressWarnings("unchecked")
-        final T[] smallerArray = (T[]) Array.newInstance(array.getClass().getComponentType(), array.length - 1);
-        final int index = randomIntBetween(0, array.length - 1);
-        if (index > 0) {
-            System.arraycopy(array, 0, smallerArray, 0, index);
-        }
-        if (index < array.length - 1) {
-            System.arraycopy(array, index + 1, smallerArray, index, array.length - index - 1);
-        }
-        return smallerArray;
+        final List<IndexMetaData> collectionLessAnItem = new ArrayList<>();
+        collectionLessAnItem.addAll(Arrays.asList(array));
+        final int toRemoveIndex = randomIntBetween(0, array.length - 1);
+        collectionLessAnItem.remove(toRemoveIndex);
+        return collectionLessAnItem.toArray(new IndexMetaData[0]);
     }
 }