未验证 提交 94b205f2 编写于 作者: E Evan 提交者: GitHub

fix index not found on trace query when using es7 (#5911)

* fix index not found on trace query when using es7

* add changelog
Co-authored-by: NEvan <evanljp@outlook.com>
上级 2150904f
...@@ -54,6 +54,7 @@ Release Notes. ...@@ -54,6 +54,7 @@ Release Notes.
* Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`. * Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`.
* Remove unused min date timebucket in jdbc deletehistory logical * Remove unused min date timebucket in jdbc deletehistory logical
* Fix "transaction too large error" when use TiDB as storage. * Fix "transaction too large error" when use TiDB as storage.
* Fix "index not found" in trace query when use ES7 storage.
* Add otel rules to ui template to observe Istio control plane. * Add otel rules to ui template to observe Istio control plane.
* Remove istio mixer * Remove istio mixer
* Support close influxdb batch write model. * Support close influxdb batch write model.
......
...@@ -48,6 +48,7 @@ import org.elasticsearch.action.index.IndexRequest; ...@@ -48,6 +48,7 @@ import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.GetAliasesResponse; import org.elasticsearch.client.GetAliasesResponse;
...@@ -195,6 +196,7 @@ public class ElasticSearch7Client extends ElasticSearchClient { ...@@ -195,6 +196,7 @@ public class ElasticSearch7Client extends ElasticSearchClient {
@Override @Override
public SearchResponse doSearch(SearchSourceBuilder searchSourceBuilder, String... indexNames) throws IOException { public SearchResponse doSearch(SearchSourceBuilder searchSourceBuilder, String... indexNames) throws IOException {
SearchRequest searchRequest = new SearchRequest(indexNames); SearchRequest searchRequest = new SearchRequest(indexNames);
searchRequest.indicesOptions(IndicesOptions.fromOptions(true, true, true, false));
searchRequest.source(searchSourceBuilder); searchRequest.source(searchSourceBuilder);
try { try {
SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT); SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册