(helix) branch master updated: Fix condition to check if DOMAIN has all required TOPOLOGY keys and allows for extra kv pairs, to reduce noisy logs. (#2688)

[xyuanlu]

This is an automated email from the ASF dual-hosted git repository.

xyuanlu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f2a88df1 Fix condition to check if DOMAIN has all required TOPOLOGY 
keys and allows for extra kv pairs, to reduce noisy logs. (#2688)
7f2a88df1 is described below

commit 7f2a88df1b4af8718f1d0ae1e085db8aaa62650a
Author: Zachary Pinto <zapi...@linkedin.com>
AuthorDate: Thu Nov 2 11:47:58 2023 -0700

    Fix condition to check if DOMAIN has all required TOPOLOGY keys and allows 
for extra kv pairs, to reduce noisy logs. (#2688)
---
 .../java/org/apache/helix/controller/rebalancer/topology/Topology.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/topology/Topology.java
 
b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/topology/Topology.java
index dba120168..4d4ebabd1 100644
--- 
a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/topology/Topology.java
+++ 
b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/topology/Topology.java
@@ -233,7 +233,7 @@ public class Topology {
             return instanceTopologyMap;
           }
         }
-        if (numOfMatchedKeys != domainAsMap.size()) {
+        if (numOfMatchedKeys < 
clusterTopologyConfig.getTopologyKeyDefaultValue().size()) {
           logger.warn(
               "Key-value pairs in InstanceConfig.Domain {} do not align with 
keys in ClusterConfig.Topology "
                   + "{}, using default domain value instead", 
instanceConfig.getDomainAsString(),