Resolve the incorrect scroll_current when delete or close index (#45226)

Resolve the incorrect current scroll for deleted or closed index
elastic · Sep 6, 2019 · 7582af2 · 7582af2
1 parent f2a6c88
commit 7582af2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java
@@ -117,6 +117,22 @@ public void add(Stats stats) {
             suggestCurrent += stats.suggestCurrent;
         }
 
+        public void addForClosingShard(Stats stats) {
+            queryCount += stats.queryCount;
+            queryTimeInMillis += stats.queryTimeInMillis;
+
+            fetchCount += stats.fetchCount;
+            fetchTimeInMillis += stats.fetchTimeInMillis;
+
+            scrollCount += stats.scrollCount;
+            scrollTimeInMillis += stats.scrollTimeInMillis;
+            // need consider the count of the shard's current scroll
+            scrollCount += stats.scrollCurrent;
+
+            suggestCount += stats.suggestCount;
+            suggestTimeInMillis += stats.suggestTimeInMillis;
+        }
+
         public long getQueryCount() {
             return queryCount;
         }
@@ -274,6 +290,13 @@ public void addTotals(SearchStats searchStats) {
         totalStats.add(searchStats.totalStats);
     }
 
+    public void addTotalsForClosingShard(SearchStats searchStats) {
+        if (searchStats == null) {
+            return;
+        }
+        totalStats.addForClosingShard(searchStats.totalStats);
+    }
+
     public Stats getTotal() {
         return this.totalStats;
     }

diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java
@@ -727,7 +727,8 @@ public synchronized void beforeIndexShardClosed(ShardId shardId, @Nullable Index
             if (indexShard != null) {
                 getStats.addTotals(indexShard.getStats());
                 indexingStats.addTotals(indexShard.indexingStats());
-                searchStats.addTotals(indexShard.searchStats());
+                // if this index was closed or deleted, we should eliminate the effect of the current scroll for this shard
+                searchStats.addTotalsForClosingShard(indexShard.searchStats());
                 mergeStats.addTotals(indexShard.mergeStats());
                 refreshStats.addTotals(indexShard.refreshStats());
                 flushStats.addTotals(indexShard.flushStats());