This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 8dbc80b3d7 faq (#10777)
8dbc80b3d7 is described below
commit 8dbc80b3d762ab8e1c59e50bc303f049734cfc60
Author: xin gu <[email protected]>
AuthorDate: Sat Oct 22 15:37:14 2022 +0800
faq (#10777)
---
.../org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java | 7 ++++---
.../dubbo/rpc/cluster/support/MergeableClusterInvoker.java | 9 +++++----
.../org/apache/dubbo/common/constants/LoggerCodeConstants.java | 2 ++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
index 2911eac412..00215ab02a 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.rpc.cluster.filter;
import org.apache.dubbo.common.Experimental;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.SPI;
-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.rpc.BaseFilter;
import org.apache.dubbo.rpc.Filter;
@@ -35,6 +35,7 @@ import org.apache.dubbo.rpc.cluster.Directory;
import java.util.List;
import java.util.stream.Collectors;
+import static
org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_ASYN_INVOKE_FAILED;
import static org.apache.dubbo.common.extension.ExtensionScope.APPLICATION;
@SPI(value = "default", scope = APPLICATION)
@@ -179,7 +180,7 @@ public interface FilterChainBuilder {
}
class CallbackRegistrationInvoker<T, FILTER extends BaseFilter> implements
Invoker<T> {
- static final Logger LOGGER =
LoggerFactory.getLogger(CallbackRegistrationInvoker.class);
+ private static final ErrorTypeAwareLogger LOGGER =
LoggerFactory.getErrorTypeAwareLogger(CallbackRegistrationInvoker.class);
final Invoker<T> filterInvoker;
final List<FILTER> filters;
@@ -220,7 +221,7 @@ public interface FilterChainBuilder {
}
}
} catch (RuntimeException runtimeException) {
- LOGGER.error(String.format("Exception occurred while
executing the %s filter named %s.", i, filter.getClass().getSimpleName()));
+ LOGGER.error(CLUSTER_ASYN_INVOKE_FAILED,"asyn Invoke
exception","",String.format("Exception occurred while executing the %s filter
named %s.", i, filter.getClass().getSimpleName()),runtimeException);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(String.format("Whole filter list is:
%s", filters.stream().map(tmpFilter ->
tmpFilter.getClass().getSimpleName()).collect(Collectors.toList())));
}
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
index 1253b1aae7..ceb97a7488 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.rpc.cluster.support;
-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.ConfigUtils;
import org.apache.dubbo.rpc.AsyncRpcResult;
@@ -41,6 +41,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import static
org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_ASYN_INVOKE_FAILED;
import static org.apache.dubbo.rpc.Constants.ASYNC_KEY;
import static org.apache.dubbo.rpc.Constants.MERGER_KEY;
@@ -50,7 +51,7 @@ import static org.apache.dubbo.rpc.Constants.MERGER_KEY;
@SuppressWarnings("unchecked")
public class MergeableClusterInvoker<T> extends AbstractClusterInvoker<T> {
- private static final Logger log =
LoggerFactory.getLogger(MergeableClusterInvoker.class);
+ private static final ErrorTypeAwareLogger log =
LoggerFactory.getErrorTypeAwareLogger(MergeableClusterInvoker.class);
public MergeableClusterInvoker(Directory<T> directory) {
super(directory);
@@ -101,8 +102,8 @@ public class MergeableClusterInvoker<T> extends
AbstractClusterInvoker<T> {
try {
Result r = asyncResult.get(Integer.MAX_VALUE,
TimeUnit.MILLISECONDS);
if (r.hasException()) {
- log.error("Invoke " +
getGroupDescFromServiceKey(entry.getKey()) +
- " failed: " + r.getException().getMessage(),
r.getException());
+ log.error(CLUSTER_ASYN_INVOKE_FAILED,"asyn Invoke
exception","","Invoke " + getGroupDescFromServiceKey(entry.getKey()) +
+ " failed: " +
r.getException().getMessage(),r.getException());
} else {
resultList.add(r);
}
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
index 78304d3c93..78b141db94 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
@@ -110,6 +110,8 @@ public interface LoggerCodeConstants {
String CLUSTER_NO_RULE_LISTENER = "2-18";
+ String CLUSTER_ASYN_INVOKE_FAILED = "2-19";
+
// proxy module 3-1
String PROXY_FAILED_CONVERT_URL = "3-1";