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

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


The following commit(s) were added to refs/heads/3.1 by this push:
     new 4ec85c211a faq (#10566)
4ec85c211a is described below

commit 4ec85c211aefa5a6cc8ed30d60551f279377142d
Author: xin gu <[email protected]>
AuthorDate: Wed Sep 7 15:51:55 2022 +0800

    faq (#10566)
    
    faq
---
 .../router/mesh/util/MeshRuleDispatcher.java       |  5 +++--
 .../cluster/support/FailoverClusterInvoker.java    | 22 +++++++++++-----------
 .../support/wrapper/MockClusterInvoker.java        |  8 ++++----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java
index 3a3c240bc4..7666da472c 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java
@@ -17,7 +17,7 @@
 
 package org.apache.dubbo.rpc.cluster.router.mesh.util;
 
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.ConcurrentHashSet;
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 
 public class MeshRuleDispatcher {
-    public static final Logger logger = 
LoggerFactory.getLogger(MeshRuleDispatcher.class);
+    private static final ErrorTypeAwareLogger logger = 
LoggerFactory.getErrorTypeAwareLogger(MeshRuleDispatcher.class);
 
     private final String appName;
     private final Map<String, Set<MeshRuleListener>> listenerMap = new 
ConcurrentHashMap<>();
@@ -55,6 +55,7 @@ public class MeshRuleDispatcher {
                         listener.onRuleChange(appName, entry.getValue());
                     }
                 } else {
+                    logger.warn("2-18","Receive mesh rule but none of listener 
has been registered","","Receive rule but none of listener has been registered. 
Maybe type not matched. Rule Type: " + ruleType);
                     logger.warn("Receive rule but none of listener has been 
registered. Maybe type not matched. Rule Type: " + ruleType);
                 }
             }
diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
index 8781dc7249..12cee0474d 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
@@ -17,7 +17,7 @@
 package org.apache.dubbo.rpc.cluster.support;
 
 import org.apache.dubbo.common.Version;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.NetUtils;
 import org.apache.dubbo.rpc.Invocation;
@@ -46,7 +46,7 @@ import static 
org.apache.dubbo.common.constants.CommonConstants.RETRIES_KEY;
  */
 public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
 
-    private static final Logger logger = 
LoggerFactory.getLogger(FailoverClusterInvoker.class);
+    private static final ErrorTypeAwareLogger logger = 
LoggerFactory.getErrorTypeAwareLogger(FailoverClusterInvoker.class);
 
     public FailoverClusterInvoker(Directory<T> directory) {
         super(directory);
@@ -79,15 +79,15 @@ public class FailoverClusterInvoker<T> extends 
AbstractClusterInvoker<T> {
             try {
                 Result result = invokeWithContext(invoker, invocation);
                 if (le != null && logger.isWarnEnabled()) {
-                    logger.warn("Although retry the method " + methodName
-                            + " in the service " + getInterface().getName()
-                            + " was successful by the provider " + 
invoker.getUrl().getAddress()
-                            + ", but there have been failed providers " + 
providers
-                            + " (" + providers.size() + "/" + 
copyInvokers.size()
-                            + ") from the registry " + 
directory.getUrl().getAddress()
-                            + " on the consumer " + NetUtils.getLocalHost()
-                            + " using the dubbo version " + 
Version.getVersion() + ". Last error is: "
-                            + le.getMessage(), le);
+                    logger.warn("2-16","failed to retry do 
invoke","","Although retry the method " + methodName
+                        + " in the service " + getInterface().getName()
+                        + " was successful by the provider " + 
invoker.getUrl().getAddress()
+                        + ", but there have been failed providers " + providers
+                        + " (" + providers.size() + "/" + copyInvokers.size()
+                        + ") from the registry " + 
directory.getUrl().getAddress()
+                        + " on the consumer " + NetUtils.getLocalHost()
+                        + " using the dubbo version " + Version.getVersion() + 
". Last error is: "
+                        + le.getMessage(),le);
                 }
                 success = true;
                 return result;
diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
index e6147da7f8..ec2596dd98 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.rpc.cluster.support.wrapper;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.constants.CommonConstants;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.ConfigUtils;
@@ -45,7 +45,7 @@ import static 
org.apache.dubbo.rpc.cluster.Constants.INVOCATION_NEED_MOCK;
 
 public class MockClusterInvoker<T> implements ClusterInvoker<T> {
 
-    private static final Logger logger = 
LoggerFactory.getLogger(MockClusterInvoker.class);
+    private static final ErrorTypeAwareLogger logger = 
LoggerFactory.getErrorTypeAwareLogger(MockClusterInvoker.class);
     private static final boolean setFutureWhenSync = 
Boolean.parseBoolean(System.getProperty(CommonConstants.SET_FUTURE_IN_SYNC_MODE,
 "true"));
 
     private final Directory<T> directory;
@@ -102,7 +102,7 @@ public class MockClusterInvoker<T> implements 
ClusterInvoker<T> {
             result = this.invoker.invoke(invocation);
         } else if (value.startsWith(FORCE_KEY)) {
             if (logger.isWarnEnabled()) {
-                logger.warn("force-mock: " + invocation.getMethodName() + " 
force-mock enabled , url : " + getUrl());
+                logger.warn("2-17","force mock","","force-mock: " + 
invocation.getMethodName() + " force-mock enabled , url : " + getUrl());
             }
             //force:direct mock
             result = doMockInvoke(invocation, null);
@@ -127,7 +127,7 @@ public class MockClusterInvoker<T> implements 
ClusterInvoker<T> {
                 }
 
                 if (logger.isWarnEnabled()) {
-                    logger.warn("fail-mock: " + invocation.getMethodName() + " 
fail-mock enabled , url : " + getUrl(), e);
+                    logger.warn("2-17","failed to mock invoke","","fail-mock: 
" + invocation.getMethodName() + " fail-mock enabled , url : " + getUrl(),e);
                 }
                 result = doMockInvoke(invocation, e);
             }

Reply via email to