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

Don't mark shard as refreshPending on stats fetching (#40458) 

Completion and DocStats are pulled from internal readers
instead of external since #33835 and #33847 which doesn't require
us to refresh after a stats call since refreshes will happen internally
anyhow and that will cause updated stats on ongoing indexing.
This commit is contained in:
Simon Willnauer 2019-04-02 16:13:53 +02:00
parent b78d63d624
commit dd624c31b0
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View File

@ -947,9 +947,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl
public DocsStats docStats() { public DocsStats docStats() {
readAllowed(); readAllowed();
DocsStats docsStats = getEngine().docStats(); return getEngine().docStats();
markSearcherAccessed();
return docsStats;
} }
/** /**
@ -1028,11 +1026,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl
public CompletionStats completionStats(String... fields) { public CompletionStats completionStats(String... fields) {
readAllowed(); readAllowed();
try { try {
CompletionStats stats = getEngine().completionStats(fields); return getEngine().completionStats(fields);
// we don't wait for a pending refreshes here since it's a stats call instead we mark it as accessed only which will cause
// the next scheduled refresh to go through and refresh the stats as well
markSearcherAccessed();
return stats;
} catch (IOException e) { } catch (IOException e) {
throw new UncheckedIOException(e); throw new UncheckedIOException(e);
} }

4
server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
View File

@ -2767,7 +2767,7 @@ public class IndexShardTests extends IndexShardTestCase {
}); });
long prevAccessTime = shard.getLastSearcherAccess(); long prevAccessTime = shard.getLastSearcherAccess();
indexShard.completionStats(); indexShard.completionStats();
assertThat("searcher was not marked as accessed", shard.getLastSearcherAccess(), greaterThan(prevAccessTime)); assertThat("searcher was marked as accessed", shard.getLastSearcherAccess(), equalTo(prevAccessTime));
} finally { } finally {
closeShards(indexShard); closeShards(indexShard);
} }
@ -2797,7 +2797,7 @@ public class IndexShardTests extends IndexShardTestCase {
}); });
long prevAccessTime = shard.getLastSearcherAccess(); long prevAccessTime = shard.getLastSearcherAccess();
final DocsStats docsStats = indexShard.docStats(); final DocsStats docsStats = indexShard.docStats();
assertThat("searcher was not marked as accessed", shard.getLastSearcherAccess(), greaterThan(prevAccessTime)); assertThat("searcher was marked as accessed", shard.getLastSearcherAccess(), equalTo(prevAccessTime));
assertThat(docsStats.getCount(), equalTo(numDocs)); assertThat(docsStats.getCount(), equalTo(numDocs));
try (Engine.Searcher searcher = indexShard.acquireSearcher("test")) { try (Engine.Searcher searcher = indexShard.acquireSearcher("test")) {
assertTrue(searcher.reader().numDocs() <= docsStats.getCount()); assertTrue(searcher.reader().numDocs() <= docsStats.getCount());