[dubbo] branch master updated: Add router fail fast option (Backport #9388) (#11188)

[albumenj]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bf29eb5706 Add router fail fast option (Backport #9388) (#11188)
bf29eb5706 is described below

commit bf29eb5706eb7a392c8f3e72192f684943f99403
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Wed Dec 21 23:44:42 2022 +0800

    Add router fail fast option (Backport #9388) (#11188)
    
    * Add router fail fast option (Backport #9388)
    
    * update
---
 .../src/main/java/org/apache/dubbo/rpc/cluster/Constants.java  |  2 ++
 .../apache/dubbo/registry/integration/DynamicDirectory.java    | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java
index f7cf951419..0bd29a8753 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java
@@ -103,4 +103,6 @@ public interface Constants {
      * prefix of arguments router key
      */
     String ARGUMENTS = "arguments";
+
+    String SHOULD_FAIL_FAST_KEY = "dubbo.router.should-fail-fast";
 }
diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
index 0fe03d3e55..324c410f2b 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.registry.integration;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.URLBuilder;
 import org.apache.dubbo.common.Version;
+import org.apache.dubbo.common.config.ConfigurationUtils;
 import org.apache.dubbo.common.extension.ExtensionLoader;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
@@ -33,6 +34,7 @@ import org.apache.dubbo.rpc.Protocol;
 import org.apache.dubbo.rpc.RpcException;
 import org.apache.dubbo.rpc.cluster.Cluster;
 import org.apache.dubbo.rpc.cluster.Configurator;
+import org.apache.dubbo.rpc.cluster.Constants;
 import org.apache.dubbo.rpc.cluster.RouterChain;
 import org.apache.dubbo.rpc.cluster.RouterFactory;
 import org.apache.dubbo.rpc.cluster.directory.AbstractDirectory;
@@ -94,6 +96,11 @@ public abstract class DynamicDirectory<T> extends 
AbstractDirectory<T> implement
 
     protected ServiceInstancesChangedListener serviceListener;
 
+    /**
+     * Should continue route if directory is empty
+     */
+    private final boolean shouldFailFast;
+
     public DynamicDirectory(Class<T> serviceType, URL url) {
         super(url, true);
 
@@ -114,6 +121,7 @@ public abstract class DynamicDirectory<T> extends 
AbstractDirectory<T> implement
         this.overrideDirectoryUrl = this.directoryUrl = 
turnRegistryUrlToConsumerUrl(url);
         String group = directoryUrl.getParameter(GROUP_KEY, "");
         this.multiGroup = group != null && (ANY_VALUE.equals(group) || 
group.contains(","));
+        this.shouldFailFast = 
Boolean.parseBoolean(ConfigurationUtils.getProperty(Constants.SHOULD_FAIL_FAST_KEY,
 "true"));
     }
 
     @Override
@@ -162,7 +170,7 @@ public abstract class DynamicDirectory<T> extends 
AbstractDirectory<T> implement
 
     @Override
     public List<Invoker<T>> doList(Invocation invocation) {
-        if (forbidden) {
+        if (forbidden && shouldFailFast) {
             // 1. No service provider 2. Service providers are disabled
             throw new RpcException(RpcException.FORBIDDEN_EXCEPTION, "No 
provider available from registry " +
                     getUrl().getAddress() + " for service " + 
getConsumerUrl().getServiceKey() + " on consumer " +