Skip to content

Commit 20d861c

Browse files
Add logging and enable testQueryRewrite (#53809)
This adds reenables IndicesRequestCacheIT.testQueryRewrite and enables logging for it. Relates to #32827
1 parent f783670 commit 20d861c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ BytesReference getOrCompute(CacheEntity cacheEntity, Supplier<BytesReference> lo
124124
if (cacheLoader.isLoaded()) {
125125
key.entity.onMiss();
126126
if (logger.isTraceEnabled()) {
127-
logger.trace("Cache miss for reader version [{}] and request:\n {}", reader.getVersion(), cacheKeyRenderer.get());
127+
logger.trace("Cache miss for reader version [{}], max_doc[{}] and request:\n {}",
128+
reader.getVersion(), reader.maxDoc(), cacheKeyRenderer.get());
128129
}
129130
// see if its the first time we see this reader, and make sure to register a cleanup key
130131
CleanupKey cleanupKey = new CleanupKey(cacheEntity, reader.getReaderCacheHelper().getKey());
@@ -137,7 +138,8 @@ BytesReference getOrCompute(CacheEntity cacheEntity, Supplier<BytesReference> lo
137138
} else {
138139
key.entity.onHit();
139140
if (logger.isTraceEnabled()) {
140-
logger.trace("Cache hit for reader version [{}] and request:\n {}", reader.getVersion(), cacheKeyRenderer.get());
141+
logger.trace("Cache hit for reader version [{}], max_doc[{}] and request:\n {}",
142+
reader.getVersion(), reader.maxDoc(), cacheKeyRenderer.get());
141143
}
142144
}
143145
return value;

server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket;
3636
import org.elasticsearch.test.ESIntegTestCase;
3737
import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
38+
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
3839

3940
import java.time.ZoneId;
4041
import java.time.ZoneOffset;
@@ -97,7 +98,9 @@ public void testCacheAggs() throws Exception {
9798
}
9899
}
99100

100-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/32827")
101+
@TestIssueLogging(
102+
value = "org.elasticsearch.indices.IndicesRequestCache:TRACE",
103+
issueUrl = "https://github.com/elastic/elasticsearch/issues/32827")
101104
public void testQueryRewrite() throws Exception {
102105
Client client = client();
103106
assertAcked(client.admin().indices().prepareCreate("index").setMapping("s", "type=date")

0 commit comments

Comments
 (0)