|
17 | 17 | import org.apache.lucene.search.Query; |
18 | 18 | import org.apache.lucene.search.TopDocs; |
19 | 19 | import org.elasticsearch.ElasticsearchException; |
20 | | -import org.elasticsearch.ElasticsearchTimeoutException; |
21 | 20 | import org.elasticsearch.action.ActionListener; |
22 | 21 | import org.elasticsearch.action.ActionRunnable; |
23 | 22 | import org.elasticsearch.action.ResolvedIndices; |
|
33 | 32 | import org.elasticsearch.common.UUIDs; |
34 | 33 | import org.elasticsearch.common.breaker.CircuitBreaker; |
35 | 34 | import org.elasticsearch.common.component.AbstractLifecycleComponent; |
| 35 | +import org.elasticsearch.common.logging.LoggerMessageFormat; |
36 | 36 | import org.elasticsearch.common.lucene.Lucene; |
37 | 37 | import org.elasticsearch.common.settings.Setting; |
38 | 38 | import org.elasticsearch.common.settings.Setting.Property; |
|
112 | 112 | import org.elasticsearch.search.query.QuerySearchRequest; |
113 | 113 | import org.elasticsearch.search.query.QuerySearchResult; |
114 | 114 | import org.elasticsearch.search.query.ScrollQuerySearchResult; |
| 115 | +import org.elasticsearch.search.query.SearchTimeoutException; |
115 | 116 | import org.elasticsearch.search.rank.feature.RankFeatureResult; |
116 | 117 | import org.elasticsearch.search.rank.feature.RankFeatureShardPhase; |
117 | 118 | import org.elasticsearch.search.rank.feature.RankFeatureShardRequest; |
@@ -598,9 +599,13 @@ private <T extends RefCounted> void ensureAfterSeqNoRefreshed( |
598 | 599 | final TimeValue timeout = request.getWaitForCheckpointsTimeout(); |
599 | 600 | final Scheduler.ScheduledCancellable timeoutTask = NO_TIMEOUT.equals(timeout) ? null : threadPool.schedule(() -> { |
600 | 601 | if (isDone.compareAndSet(false, true)) { |
601 | | - listener.onFailure( |
602 | | - new ElasticsearchTimeoutException("Wait for seq_no [{}] refreshed timed out [{}]", waitForCheckpoint, timeout) |
| 602 | + var shardTarget = new SearchShardTarget( |
| 603 | + shard.routingEntry().currentNodeId(), |
| 604 | + shard.shardId(), |
| 605 | + request.getClusterAlias() |
603 | 606 | ); |
| 607 | + var message = LoggerMessageFormat.format("Wait for seq_no [{}] refreshed timed out [{}]", waitForCheckpoint, timeout); |
| 608 | + listener.onFailure(new SearchTimeoutException(shardTarget, message)); |
604 | 609 | } |
605 | 610 | }, timeout, EsExecutors.DIRECT_EXECUTOR_SERVICE); |
606 | 611 |
|
|
0 commit comments