From 94b205f23a38f344ea0ba32d3ff3baa3bcefbace Mon Sep 17 00:00:00 2001 From: Evan <31562192+EvanLjp@users.noreply.github.com> Date: Fri, 27 Nov 2020 16:59:21 +0800 Subject: [PATCH] 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: Evan --- CHANGES.md | 1 + .../plugin/elasticsearch7/client/ElasticSearch7Client.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ee96fbeae1..7f4f5aec28 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -54,6 +54,7 @@ Release Notes. * Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`. * Remove unused min date timebucket in jdbc deletehistory logical * 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. * Remove istio mixer * Support close influxdb batch write model. diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java index 2f2d518eef..8f5ec2807e 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java @@ -48,6 +48,7 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.ActiveShardCount; +import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.GetAliasesResponse; @@ -195,6 +196,7 @@ public class ElasticSearch7Client extends ElasticSearchClient { @Override public SearchResponse doSearch(SearchSourceBuilder searchSourceBuilder, String... indexNames) throws IOException { SearchRequest searchRequest = new SearchRequest(indexNames); + searchRequest.indicesOptions(IndicesOptions.fromOptions(true, true, true, false)); searchRequest.source(searchSourceBuilder); try { SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT); -- GitLab