diff --git a/server/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java index fc693113fee..f513a8577b6 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -66,6 +66,7 @@ import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.merge.MergeStats; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbers; +import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; @@ -175,6 +176,41 @@ public abstract class Engine implements Closeable { /** Returns how many bytes we are currently moving from heap to disk */ public abstract long getWritingBytes(); + /** + * Returns the {@link DocsStats} for this engine + */ + public DocsStats docStats() { + // we calculate the doc stats based on the internal reader that is more up-to-date and not subject + // to external refreshes. For instance we don't refresh an external reader if we flush and indices with + // index.refresh_interval=-1 won't see any doc stats updates at all. This change will give more accurate statistics + // when indexing but not refreshing in general. Yet, if a refresh happens the internal reader is refresh as well so we are + // safe here. + try (Engine.Searcher searcher = acquireSearcher("docStats", Engine.SearcherScope.INTERNAL)) { + return docsStats(searcher.reader()); + } + } + + protected final DocsStats docsStats(IndexReader indexReader) { + long numDocs = 0; + long numDeletedDocs = 0; + long sizeInBytes = 0; + // 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 + for (LeafReaderContext readerContext : indexReader.leaves()) { + // we go on the segment level here to get accurate numbers + final SegmentReader segmentReader = Lucene.segmentReader(readerContext.reader()); + SegmentCommitInfo info = segmentReader.getSegmentInfo(); + numDocs += readerContext.reader().numDocs(); + numDeletedDocs += readerContext.reader().numDeletedDocs(); + try { + sizeInBytes += info.sizeInBytes(); + } catch (IOException e) { + logger.trace(() -> new ParameterizedMessage("failed to get size for [{}]", info.info.name), e); + } + } + return new DocsStats(numDocs, numDeletedDocs, sizeInBytes); + } + /** * A throttling class that can be activated, causing the * {@code acquireThrottle} method to block on a lock when throttling diff --git a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java index b958bd84b76..80b65393929 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java @@ -34,6 +34,7 @@ import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbers; +import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogStats; @@ -63,6 +64,7 @@ public final class ReadOnlyEngine extends Engine { private final SearcherManager searcherManager; private final IndexCommit indexCommit; private final Lock indexWriterLock; + private final DocsStats docsStats; /** * Creates a new ReadOnlyEngine. This ctor can also be used to open a read-only engine on top of an already opened @@ -101,6 +103,7 @@ public final class ReadOnlyEngine extends Engine { this.indexCommit = reader.getIndexCommit(); this.searcherManager = new SearcherManager(reader, new RamAccountingSearcherFactory(engineConfig.getCircuitBreakerService())); + this.docsStats = docsStats(reader); this.indexWriterLock = indexWriterLock; success = true; } finally { @@ -365,4 +368,9 @@ public final class ReadOnlyEngine extends Engine { @Override public void maybePruneDeletes() { } + + @Override + public DocsStats docStats() { + return docsStats; + } } diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index 168444a2267..51549b439a3 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -21,13 +21,9 @@ package org.elasticsearch.index.shard; import com.carrotsearch.hppc.ObjectLongMap; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.IndexCommit; -import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentInfos; -import org.apache.lucene.index.SegmentReader; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryCachingPolicy; @@ -879,32 +875,9 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl } public DocsStats docStats() { - // we calculate the doc stats based on the internal reader that is more up-to-date and not subject - // to external refreshes. For instance we don't refresh an external reader if we flush and indices with - // index.refresh_interval=-1 won't see any doc stats updates at all. This change will give more accurate statistics - // when indexing but not refreshing in general. Yet, if a refresh happens the internal reader is refresh as well so we are - // safe here. - long numDocs = 0; - long numDeletedDocs = 0; - long sizeInBytes = 0; - try (Engine.Searcher searcher = acquireSearcher("docStats", Engine.SearcherScope.INTERNAL)) { - // 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(); - for (LeafReaderContext reader : searcher.reader().leaves()) { - // we go on the segment level here to get accurate numbers - final SegmentReader segmentReader = Lucene.segmentReader(reader.reader()); - SegmentCommitInfo info = segmentReader.getSegmentInfo(); - numDocs += reader.reader().numDocs(); - numDeletedDocs += reader.reader().numDeletedDocs(); - try { - sizeInBytes += info.sizeInBytes(); - } catch (IOException e) { - logger.trace(() -> new ParameterizedMessage("failed to get size for [{}]", info.info.name), e); - } - } - } - return new DocsStats(numDocs, numDeletedDocs, sizeInBytes); + DocsStats docsStats = getEngine().docStats(); + markSearcherAccessed(); + return docsStats; } /** diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index b74b5343a82..c1803619ed5 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -2438,7 +2438,7 @@ public class IndexShardTests extends IndexShardTestCase { closeShards(sourceShard, targetShard); } - public void testDocStats() throws IOException, InterruptedException { + public void testDocStats() throws Exception { IndexShard indexShard = null; try { indexShard = newStartedShard( @@ -2455,7 +2455,14 @@ public class IndexShardTests extends IndexShardTestCase { indexShard.flush(new FlushRequest()); } { + IndexShard shard = indexShard; + assertBusy(() -> { + ThreadPool threadPool = shard.getThreadPool(); + assertThat(threadPool.relativeTimeInMillis(), greaterThan(shard.getLastSearcherAccess())); + }); + long prevAccessTime = shard.getLastSearcherAccess(); final DocsStats docsStats = indexShard.docStats(); + assertThat("searcher was not marked as accessed", shard.getLastSearcherAccess(), greaterThan(prevAccessTime)); assertThat(docsStats.getCount(), equalTo(numDocs)); try (Engine.Searcher searcher = indexShard.acquireSearcher("test")) { assertTrue(searcher.reader().numDocs() <= docsStats.getCount()); @@ -3412,4 +3419,9 @@ public class IndexShardTests extends IndexShardTestCase { assertThat(shard.translogStats().estimatedNumberOfOperations(), equalTo(translogStats.estimatedNumberOfOperations())); closeShard(shard, false); } + + @Override + public Settings threadPoolSettings() { + return Settings.builder().put(super.threadPoolSettings()).put("thread_pool.estimated_time_interval", "5ms").build(); + } }