From 2f72a3cace4d99fceacfbb9bcbee9f85eeef24a6 Mon Sep 17 00:00:00 2001 From: mrproliu <741550557@qq.com> Date: Sun, 8 May 2022 13:05:51 +0800 Subject: [PATCH] Fix pod match error when the service have multiple selector (#9008) --- docs/en/changes/changes.md | 1 + .../skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 86fd375b0c..30750a57fa 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -44,6 +44,7 @@ * Clean up scroll contexts after used. * Support autocomplete tags in logs query. * Enhance Deprecated MetricQuery(v1) getValues querying to asynchronous concurrency query +* Fix the pod match error when the service has multiple selector in kubernetes environment. #### UI diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java index 8b76c5615a..eb318bdd8b 100644 --- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java +++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java @@ -223,10 +223,10 @@ public class K8sInfoRegistry { Objects.requireNonNull(o); Objects.requireNonNull(c); for (final Object value : o) { - if (c.contains(value)) { - return true; + if (!c.contains(value)) { + return false; } } - return false; + return true; } }