From 3a2706d104e42220dd64ecbb2b03fad052285f94 Mon Sep 17 00:00:00 2001 From: gerry Date: Wed, 4 Nov 2020 19:39:06 +0800 Subject: [PATCH] Fix storage-influxdb-plugin serviceCode query (#5792) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix storage-influxdb-plugin serviceCode query * Update CHANGES.md Add the changelog for the PR as I have time. Co-authored-by: yuanguohua Co-authored-by: 吴晟 Wu Sheng --- CHANGES.md | 1 + .../oap/server/storage/plugin/influxdb/query/MetadataQuery.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 15e23b67f..9d53966c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -27,6 +27,7 @@ Release Notes. * Fix the excessive timeout period set by the kubernetes-client. * Fix deadlock problem when using elasticsearch-client-7.0.0. * Fix storage-jdbc isExists not set dbname. +* Fix `searchService` bug in the InfluxDB storage implementation. #### UI diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java index 1ff91a10e..ea9a636e0 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java @@ -137,7 +137,7 @@ public class MetadataQuery implements IMetadataQueryDAO { WhereQueryImpl query = select(ID_COLUMN, NAME) .from(client.getDatabase(), ServiceTraffic.INDEX_NAME) .where(eq(InfluxConstants.TagName.NODE_TYPE, String.valueOf(NodeType.Normal.value()))); - query.and(eq(ServiceTraffic.NODE_TYPE, serviceCode)); + query.and(eq(ServiceTraffic.NAME, serviceCode)); return buildServices(query).get(0); }