Merge pull request #19 from andrewshan/main

fix the force exception when plugin not found

Author: andrewshan

polaris-client/src/main/java/com/tencent/polaris/client/flow/BaseFlow.java

@@ -102,7 +102,7 @@ public static Instance commonGetOneInstance(Extensions extensions, ServiceKey se
         LOG.info("[ConnectionManager]success to discover service {}", svcEventKey);
         ServiceInstances serviceInstances = resourcesResponse.getServiceInstances(svcEventKey);
         RouterChainGroup sysRouterChainGroup = extensions.getSysRouterChainGroup();
-        List<ServiceRouter> coreRouters = Extensions.loadServiceRouters(coreRouterNames, extensions.getPlugins());
+        List<ServiceRouter> coreRouters = Extensions.loadServiceRouters(coreRouterNames, extensions.getPlugins(), false);
         RouterChainGroup routerChainGroup = new DefaultRouterChainGroup(sysRouterChainGroup.getBeforeRouters(),
                 coreRouters, sysRouterChainGroup.getAfterRouters());
         ServiceInstances instancesAfterRoute = BaseFlow

polaris-common/polaris-config-default/src/main/resources/conf/default-config.yml

@@ -144,7 +144,7 @@ consumer:
   #描述:节点熔断相关配置
   circuitBreaker:
     #描述: 是否启用本地节点熔断功能
-    enable: false
+    enable: true
     #描述: 故障检测周期，根据周期内故障进行熔断
     checkPeriod: 1m
     #描述: 首次熔断时间，后续熔断时间=重试次数*sleepWindow

polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/Supplier.java

@@ -29,7 +29,7 @@
 public interface Supplier {
 
     /**
-     * 获取插件实例
+     * 获取插件实例，获取不到会报异常
      *
      * @param type 插件类型
      * @param name 插件名
@@ -38,6 +38,15 @@ public interface Supplier {
      */
     Plugin getPlugin(PluginType type, String name) throws PolarisException;
 
+    /**
+     * 获取可选的插件，获取不到返回null
+     *
+     * @param type 插件类型
+     * @param name 插件名
+     * @return 插件实例
+     */
+    Plugin getOptionalPlugin(PluginType type, String name);
+
     /**
      * 获取某类型下的所有插件
      *

polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/compose/Extensions.java

@@ -21,6 +21,7 @@
 import com.tencent.polaris.api.config.consumer.OutlierDetectionConfig.When;
 import com.tencent.polaris.api.config.consumer.ServiceRouterConfig;
 import com.tencent.polaris.api.exception.PolarisException;
+import com.tencent.polaris.api.plugin.Plugin;
 import com.tencent.polaris.api.plugin.Supplier;
 import com.tencent.polaris.api.plugin.cache.FlowCache;
 import com.tencent.polaris.api.plugin.circuitbreaker.CircuitBreaker;
@@ -35,6 +36,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 流程编排所需要用到的插件实例列表
@@ -43,6 +46,8 @@
  */
 public class Extensions {
 
+    private static final Logger LOG = LoggerFactory.getLogger(Extensions.class);
+
     private LocalRegistry localRegistry;
 
     private ServerConnector serverConnector;
@@ -89,28 +94,32 @@ public void init(Configuration config, Supplier plugins, ValueContext valueConte
         loadBalancer = (LoadBalancer) plugins.getPlugin(PluginTypes.LOAD_BALANCER.getBaseType(), loadBalanceType);
 
         List<ServiceRouter> beforeRouters = loadServiceRouters(config.getConsumer().getServiceRouter().getBeforeChain(),
-                plugins);
+                plugins, true);
         List<ServiceRouter> coreRouters = loadServiceRouters(config.getConsumer().getServiceRouter().getChain(),
-                plugins);
+                plugins, false);
         List<ServiceRouter> afterRouters = loadServiceRouters(config.getConsumer().getServiceRouter().getAfterChain(),
-                plugins);
+                plugins, true);
         configRouterChainGroup = new DefaultRouterChainGroup(beforeRouters, coreRouters, afterRouters);
         //加载系统路由链
         List<String> sysBefore = new ArrayList<>();
         sysBefore.add(ServiceRouterConfig.DEFAULT_ROUTER_ISOLATED);
         List<String> sysAfter = new ArrayList<>();
         sysAfter.add(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER);
-        List<ServiceRouter> sysBeforeRouters = loadServiceRouters(sysBefore, plugins);
-        List<ServiceRouter> sysAfterRouters = loadServiceRouters(sysAfter, plugins);
+        List<ServiceRouter> sysBeforeRouters = loadServiceRouters(sysBefore, plugins, true);
+        List<ServiceRouter> sysAfterRouters = loadServiceRouters(sysAfter, plugins, true);
         sysRouterChainGroup = new DefaultRouterChainGroup(sysBeforeRouters, Collections.emptyList(), sysAfterRouters);
 
         //加载熔断器
         boolean enable = config.getConsumer().getCircuitBreaker().isEnable();
         List<String> cbChain = config.getConsumer().getCircuitBreaker().getChain();
         if (enable && CollectionUtils.isNotEmpty(cbChain)) {
             for (String cbName : cbChain) {
-                circuitBreakers.add((CircuitBreaker) plugins.getPlugin(
-                        PluginTypes.CIRCUIT_BREAKER.getBaseType(), cbName));
+                Plugin pluginValue = plugins.getOptionalPlugin(PluginTypes.CIRCUIT_BREAKER.getBaseType(), cbName);
+                if (null == pluginValue) {
+                    LOG.warn("circuitBreaker plugin {} not found", cbName);
+                    continue;
+                }
+                circuitBreakers.add((CircuitBreaker) pluginValue);
             }
         }
 
@@ -126,11 +135,21 @@ public ValueContext getValueContext() {
         return valueContext;
     }
 
-    public static List<ServiceRouter> loadServiceRouters(List<String> routerChain, Supplier plugins) {
+    public static List<ServiceRouter> loadServiceRouters(List<String> routerChain, Supplier plugins, boolean force) {
         List<ServiceRouter> routers = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(routerChain)) {
             for (String routerName : routerChain) {
-                routers.add((ServiceRouter) plugins.getPlugin(PluginTypes.SERVICE_ROUTER.getBaseType(), routerName));
+                Plugin routerPlugin;
+                if (force) {
+                    routerPlugin = plugins.getPlugin(PluginTypes.SERVICE_ROUTER.getBaseType(), routerName);
+                } else {
+                    routerPlugin = plugins.getOptionalPlugin(PluginTypes.SERVICE_ROUTER.getBaseType(), routerName);
+                }
+                if (null == routerPlugin) {
+                    LOG.warn("router {} not found", routerName);
+                    continue;
+                }
+                routers.add((ServiceRouter) routerPlugin);
             }
         }
         return Collections.unmodifiableList(routers);
@@ -141,8 +160,12 @@ private void loadOutlierDetector(Configuration config, Supplier plugins) throws
         List<String> detectionChain = config.getConsumer().getOutlierDetection().getChain();
         if (enable && CollectionUtils.isNotEmpty(detectionChain)) {
             for (String detectorName : detectionChain) {
-                outlierDetectors.add((OutlierDetector) plugins.getPlugin(
-                        PluginTypes.OUTLIER_DETECTOR.getBaseType(), detectorName));
+                Plugin pluginValue = plugins.getOptionalPlugin(PluginTypes.OUTLIER_DETECTOR.getBaseType(), detectorName);
+                if (null == pluginValue) {
+                    LOG.warn("outlierDetector plugin {} not found", detectorName);
+                    continue;
+                }
+                outlierDetectors.add((OutlierDetector) pluginValue);
             }
         }
     }

polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/impl/PluginManager.java

@@ -133,6 +133,18 @@ public Plugin getPlugin(PluginType type, String name) throws PolarisException {
         return plugins.get(name);
     }
 
+    @Override
+    public Plugin getOptionalPlugin(PluginType type, String name) {
+        if (!typedPlugins.containsKey(type)) {
+            return null;
+        }
+        Map<String, Plugin> plugins = typedPlugins.get(type);
+        if (!plugins.containsKey(name)) {
+            return null;
+        }
+        return plugins.get(name);
+    }
+
     @Override
     public Collection<Plugin> getPlugins(PluginType type) throws PolarisException {
         if (!typedPlugins.containsKey(type)) {

polaris-router/polaris-router-client/src/main/java/com/tencent/polaris/router/client/api/DefaultRouterAPI.java

@@ -75,27 +75,27 @@ protected void subInit() {
 
     @Override
     public ProcessRoutersResponse processRouters(ProcessRoutersRequest request) throws PolarisException {
-        checkAvailable("EngineAPI");
+        checkAvailable("RouterAPI");
         RouterValidator.validateProcessRouterRequest(request);
         RouterNamesGroup requestRouterGroup = request.getRouters();
         List<ServiceRouter> beforeRouters;
         if (null != requestRouterGroup && CollectionUtils.isNotEmpty(requestRouterGroup.getBeforeRouters())) {
             beforeRouters = Extensions.loadServiceRouters(
-                    requestRouterGroup.getBeforeRouters(), extensions.getPlugins());
+                    requestRouterGroup.getBeforeRouters(), extensions.getPlugins(), true);
         } else {
             beforeRouters = extensions.getConfigRouterChainGroup().getBeforeRouters();
         }
         List<ServiceRouter> afterRouters;
         if (null != requestRouterGroup && CollectionUtils.isNotEmpty(requestRouterGroup.getAfterRouters())) {
             afterRouters = Extensions.loadServiceRouters(
-                    requestRouterGroup.getAfterRouters(), extensions.getPlugins());
+                    requestRouterGroup.getAfterRouters(), extensions.getPlugins(), true);
         } else {
             afterRouters = extensions.getConfigRouterChainGroup().getAfterRouters();
         }
         List<ServiceRouter> coreRouters;
         if (null != requestRouterGroup && CollectionUtils.isNotEmpty(requestRouterGroup.getCoreRouters())) {
             coreRouters = Extensions.loadServiceRouters(
-                    requestRouterGroup.getCoreRouters(), extensions.getPlugins());
+                    requestRouterGroup.getCoreRouters(), extensions.getPlugins(), true);
         } else {
             coreRouters = extensions.getConfigRouterChainGroup().getCoreRouters();
         }