diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java index 49c2d070c0310..898e451aa3bc6 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java @@ -124,7 +124,8 @@ BytesReference getOrCompute(CacheEntity cacheEntity, Supplier lo if (cacheLoader.isLoaded()) { key.entity.onMiss(); if (logger.isTraceEnabled()) { - logger.trace("Cache miss for reader version [{}] and request:\n {}", reader.getVersion(), cacheKeyRenderer.get()); + logger.trace("Cache miss for reader version [{}], max_doc[{}] and request:\n {}", + reader.getVersion(), reader.maxDoc(), cacheKeyRenderer.get()); } // see if its the first time we see this reader, and make sure to register a cleanup key CleanupKey cleanupKey = new CleanupKey(cacheEntity, reader.getReaderCacheHelper().getKey()); @@ -137,7 +138,8 @@ BytesReference getOrCompute(CacheEntity cacheEntity, Supplier lo } else { key.entity.onHit(); if (logger.isTraceEnabled()) { - logger.trace("Cache hit for reader version [{}] and request:\n {}", reader.getVersion(), cacheKeyRenderer.get()); + logger.trace("Cache hit for reader version [{}], max_doc[{}] and request:\n {}", + reader.getVersion(), reader.maxDoc(), cacheKeyRenderer.get()); } } return value; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java index d06a7e1cecfa4..4274644217400 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java @@ -35,6 +35,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; +import org.elasticsearch.test.junit.annotations.TestIssueLogging; import java.time.ZoneId; import java.time.ZoneOffset; @@ -97,7 +98,9 @@ public void testCacheAggs() throws Exception { } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/32827") + @TestIssueLogging( + value = "org.elasticsearch.indices.IndicesRequestCache:TRACE", + issueUrl = "https://github.com/elastic/elasticsearch/issues/32827") public void testQueryRewrite() throws Exception { Client client = client(); assertAcked(client.admin().indices().prepareCreate("index").setMapping("s", "type=date")