You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/11/14 08:01:33 UTC
[dubbo] branch 3.2 updated: Add some logs (#10926)
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 95f4bcbebb Add some logs (#10926)
95f4bcbebb is described below
commit 95f4bcbebb025379e4701ba3058c769704cba6b1
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Nov 14 16:01:24 2022 +0800
Add some logs (#10926)
---
.../dubbo/rpc/cluster/directory/AbstractDirectory.java | 15 +++++++++++++++
.../client/ServiceDiscoveryRegistryDirectory.java | 8 ++++++++
.../dubbo/registry/integration/RegistryDirectory.java | 16 ++++++++++++----
3 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
index 11e7e82fa4..0fca01db7b 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
@@ -50,6 +50,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.Semaphore;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_RECONNECT_TASK_PERIOD;
@@ -260,6 +261,9 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
invokersToReconnect.add(invoker);
// 3. try start check connectivity task
checkConnectivity();
+
+ logger.info("The invoker " + invoker.getUrl() + " has been added to invalidate list due to connectivity problem. " +
+ "Will trying to reconnect to it in the background.");
}
}
@@ -434,4 +438,15 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
protected abstract List<Invoker<T>> doList(BitList<Invoker<T>> invokers, Invocation invocation) throws RpcException;
+ protected String joinValidInvokerAddresses() {
+ BitList<Invoker<T>> validInvokers = getValidInvokers().clone();
+ if (validInvokers.isEmpty()) {
+ return "empty";
+ }
+ return validInvokers.stream()
+ .limit(5)
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(","));
+ }
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
index fe98e100f4..96adfba3f1 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
@@ -275,6 +275,14 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
// notify invokers refreshed
this.invokersChanged();
+
+ logger.info("Received invokers changed event from registry. " +
+ "Registry type: instance. " +
+ "Service Key: " + getConsumerUrl().getServiceKey() + ". " +
+ "Urls Size : " + invokerUrls.size() + ". " +
+ "Invokers Size : " + getInvokers().size() + ". " +
+ "Available Size: " + getValidInvokers().size() + ". " +
+ "Available Invokers : " + joinValidInvokerAddresses());
}
/**
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 53fd6840fe..516dbd4006 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
@@ -62,13 +62,13 @@ import static org.apache.dubbo.common.constants.CommonConstants.ENABLED_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TAG_KEY;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_INIT_SERIALIZATION_OPTIMIZER;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_REFER_INVOKER;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_UNSUPPORTED;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROXY_FAILED_CONVERT_URL;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_EMPTY_ADDRESS;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_DESTROY_SERVICE;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_UNSUPPORTED_CATEGORY;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROXY_FAILED_CONVERT_URL;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_UNSUPPORTED;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_INIT_SERIALIZATION_OPTIMIZER;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_REFER_INVOKER;
import static org.apache.dubbo.common.constants.RegistryConstants.APP_DYNAMIC_CONFIGURATORS_CATEGORY;
import static org.apache.dubbo.common.constants.RegistryConstants.COMPATIBLE_CONFIG_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.CONFIGURATORS_CATEGORY;
@@ -296,6 +296,14 @@ public class RegistryDirectory<T> extends DynamicDirectory<T> {
// notify invokers refreshed
this.invokersChanged();
}
+
+ logger.info("Received invokers changed event from registry. " +
+ "Registry type: interface. " +
+ "Service Key: " + getConsumerUrl().getServiceKey() + ". " +
+ "Urls Size : " + invokerUrls.size() + ". " +
+ "Invokers Size : " + getInvokers().size() + ". " +
+ "Available Size: " + getValidInvokers().size() + ". " +
+ "Available Invokers : " + joinValidInvokerAddresses());
}
private List<Invoker<T>> toMergeInvokerList(List<Invoker<T>> invokers) {