getShardFieldStats throws AlreadyClosedException

Author: arteam

server/src/main/java/org/elasticsearch/index/engine/Engine.java

@@ -245,11 +245,12 @@ protected final DocsStats docsStats(IndexReader indexReader) {
         return new DocsStats(numDocs, numDeletedDocs, sizeInBytes);
     }
 
+    /**
+     * @throws AlreadyClosedException if the shard is closed
+     */
     public ShardFieldStats getShardFieldStats() {
         try (var searcher = acquireSearcher("shard_field_stats", Engine.SearcherScope.INTERNAL)) {
             return getShardFieldStats(searcher.getLeafContexts());
-        } catch (AlreadyClosedException ignored) {
-            return null;
         }
     }
 

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -4140,7 +4140,9 @@ public void beforeRefresh() {
         @Override
         public void afterRefresh(boolean didRefresh) {
             if (shardFieldStats == null || didRefresh) {
-                shardFieldStats = getEngine().getShardFieldStats();
+                try {
+                    shardFieldStats = getEngine().getShardFieldStats();
+                } catch (AlreadyClosedException ignored) {}
             }
         }
     }