You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/12/17 06:57:11 UTC

[incubator-dubbo] 05/07: fix problem of governance: configurator & router

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

liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit e4257677e9b276c8e73c01b246f6617cc92af1d7
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Dec 17 14:50:47 2018 +0800

    fix problem of governance: configurator & router
---
 .../config/AbstractConfigConditionRouter.java         | 12 ++++++------
 .../condition/config/model/ConditionRouterRule.java   | 10 +++++-----
 .../condition/config/model/ConditionRuleParser.java   |  2 +-
 .../integration/AbstractConfiguratorListener.java     | 19 +++++++++++++++++--
 .../dubbo/registry/integration/RegistryDirectory.java |  4 ----
 .../dubbo/registry/integration/RegistryProtocol.java  |  2 --
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AbstractConfigConditionRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AbstractConfigConditionRouter.java
index 26fad9a..5f27a29 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AbstractConfigConditionRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AbstractConfigConditionRouter.java
@@ -79,15 +79,15 @@ public abstract class AbstractConfigConditionRouter extends AbstractRouter imple
 
     @Override
     public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException {
-        if (CollectionUtils.isEmpty(invokers) || conditionRouters.size() == 0 || !isEnabled()) {
+        if (CollectionUtils.isEmpty(invokers) || conditionRouters.size() == 0) {
             return invokers;
         }
 
-        if (isRuleEnabled()) {
-            for (Router router : conditionRouters) {
-                invokers = router.route(invokers, url, invocation);
-            }
+        // We will check enabled status inside each router.
+        for (Router router : conditionRouters) {
+            invokers = router.route(invokers, url, invocation);
         }
+
         return invokers;
     }
 
@@ -129,7 +129,7 @@ public abstract class AbstractConfigConditionRouter extends AbstractRouter imple
                 routers.add(subRouter);
             });
 
-            BlackWhiteListRule blackWhiteList = rule.getBlackWhiteListRule();
+            BlackWhiteListRule blackWhiteList = rule.getBlackWhiteList();
             if (blackWhiteList != null && blackWhiteList.isValid()) {
                 blackWhiteList.getConditions().forEach(condition -> {
                     // All sub rules have the same force, runtime value.
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRouterRule.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRouterRule.java
index 97518b7..ede6913 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRouterRule.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRouterRule.java
@@ -27,7 +27,7 @@ public class ConditionRouterRule extends AbstractRouterRule {
     public ConditionRouterRule() {
     }
 
-    private BlackWhiteListRule blackWhiteListRule;
+    private BlackWhiteListRule blackWhiteList;
     private List<String> conditions;
 
     public List<String> getConditions() {
@@ -38,11 +38,11 @@ public class ConditionRouterRule extends AbstractRouterRule {
         this.conditions = conditions;
     }
 
-    public BlackWhiteListRule getBlackWhiteListRule() {
-        return blackWhiteListRule;
+    public BlackWhiteListRule getBlackWhiteList() {
+        return blackWhiteList;
     }
 
-    public void setBlackWhiteListRule(BlackWhiteListRule blackWhiteListRule) {
-        this.blackWhiteListRule = blackWhiteListRule;
+    public void setBlackWhiteList(BlackWhiteListRule blackWhiteList) {
+        this.blackWhiteList = blackWhiteList;
     }
 }
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java
index 074c1fc..4c6a04b 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/ConditionRuleParser.java
@@ -47,7 +47,7 @@ public class ConditionRuleParser {
             rule.setValid(false);
         }
 
-        BlackWhiteListRule blackWhiteList = rule.getBlackWhiteListRule();
+        BlackWhiteListRule blackWhiteList = rule.getBlackWhiteList();
         if (blackWhiteList != null && CollectionUtils.isEmpty(blackWhiteList.getConditions())) {
             blackWhiteList.setValid(false);
         }
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
index f569eb5..3d0268d 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
@@ -16,7 +16,6 @@
  */
 package org.apache.dubbo.registry.integration;
 
-import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
@@ -24,9 +23,19 @@ import org.apache.dubbo.configcenter.ConfigChangeEvent;
 import org.apache.dubbo.configcenter.ConfigChangeType;
 import org.apache.dubbo.configcenter.ConfigurationListener;
 import org.apache.dubbo.rpc.cluster.configurator.parser.ConfigParser;
+import org.apache.dubbo.rpc.model.ApplicationModel;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import static org.apache.dubbo.common.Constants.ANYHOST_VALUE;
+import static org.apache.dubbo.common.Constants.APP_DYNAMIC_CONFIGURATORS_CATEGORY;
+import static org.apache.dubbo.common.Constants.CATEGORY_KEY;
+import static org.apache.dubbo.common.Constants.CONFIGURATORS_SUFFIX;
+import static org.apache.dubbo.common.Constants.DYNAMIC_CONFIGURATORS_CATEGORY;
+import static org.apache.dubbo.common.Constants.EMPTY_PROTOCOL;
 
 /**
  *
@@ -44,7 +53,13 @@ public abstract class AbstractConfiguratorListener implements ConfigurationListe
         List<URL> urls;
         if (event.getChangeType().equals(ConfigChangeType.DELETED)) {
             urls = new ArrayList<>();
-            urls.add(new URL(Constants.EMPTY_PROTOCOL, Constants.ANYHOST_VALUE, 0));
+            Map<String, String> map = new HashMap<>(1);
+            if (event.getKey().endsWith(ApplicationModel.getApplication() + CONFIGURATORS_SUFFIX)) {
+                map.put(CATEGORY_KEY, APP_DYNAMIC_CONFIGURATORS_CATEGORY);
+            } else {
+                map.put(CATEGORY_KEY, DYNAMIC_CONFIGURATORS_CATEGORY);
+            }
+            urls.add(new URL(EMPTY_PROTOCOL, ANYHOST_VALUE, 0, map));
         } else {
             try {
                 // parseConfigurators will recognize app/service config automatically.
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index c564a47..527f6b6 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -135,8 +135,6 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
         this.multiGroup = group != null && ("*".equals(group) || group.contains(","));
         String methods = queryMap.get(Constants.METHODS_KEY);
         this.serviceMethods = methods == null ? null : Constants.COMMA_SPLIT_PATTERN.split(methods);
-
-        consumerConfigurationListener.addNotifyListener(this);
     }
 
     /**
@@ -828,7 +826,6 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
 
         @Override
         protected void notifyOverrides(List<URL> urls) {
-            urls.forEach(u -> u.addParameter(CATEGORY_KEY, DYNAMIC_CONFIGURATORS_CATEGORY));
             RegistryDirectory.this.notify(urls);
         }
     }
@@ -863,7 +860,6 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
 
         @Override
         protected void notifyOverrides(List<URL> urls) {
-            urls.forEach(u -> u.addParameter(CATEGORY_KEY, APP_DYNAMIC_CONFIGURATORS_CATEGORY));
             listeners.forEach(listener -> listener.notify(urls));
         }
     }
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index f401eb9..cfb7d28 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -562,7 +562,6 @@ public class RegistryProtocol implements Protocol {
 
         @Override
         protected void notifyOverrides(List<URL> urls) {
-            urls.forEach(u -> u.addParameter(CATEGORY_KEY, DYNAMIC_CONFIGURATORS_CATEGORY));
             notifyListener.notify(urls);
         }
     }
@@ -598,7 +597,6 @@ public class RegistryProtocol implements Protocol {
 
         @Override
         protected void notifyOverrides(List<URL> urls) {
-            urls.forEach(u -> u.addParameter(CATEGORY_KEY, APP_DYNAMIC_CONFIGURATORS_CATEGORY));
             overrideListeners.values().forEach(listener -> listener.notify(urls));
         }
     }