honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Resolve the incorrect current scroll for deleted or closed index
This commit is contained in:
Yunfeng,Wu 2019-09-06 15:44:55 +08:00 committed by jimczi
parent f2a6c88f83
commit 7582af27b0
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java
View File

@ -117,6 +117,22 @@ public class SearchStats implements Writeable, ToXContentFragment {
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 class SearchStats implements Writeable, ToXContentFragment {
totalStats.add(searchStats.totalStats);
}
public void addTotalsForClosingShard(SearchStats searchStats) {
if (searchStats == null) {
return;
}
totalStats.addForClosingShard(searchStats.totalStats);
}
public Stats getTotal() {
return this.totalStats;
}

3
server/src/main/java/org/elasticsearch/indices/IndicesService.java
View File

@ -727,7 +727,8 @@ public class IndicesService extends AbstractLifecycleComponent
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());