[dubbo] branch 3.2 updated: Add some nacos connection logs (#12494)

[albumenj]

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 8a2dffd55e Add some nacos connection logs (#12494)
8a2dffd55e is described below

commit 8a2dffd55e95d394aa05812d5948cae81fd1a3ed
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Mon Jun 12 10:10:19 2023 +0800

    Add some nacos connection logs (#12494)
---
 .../support/nacos/NacosDynamicConfiguration.java        | 17 +++++++++++------
 .../dubbo/registry/nacos/NacosConnectionManager.java    |  6 +++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git 
a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
 
b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
index 7a851e45f0..1c1e2afda4 100644
--- 
a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
+++ 
b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
@@ -17,11 +17,6 @@
 
 package org.apache.dubbo.configcenter.support.nacos;
 
-import com.alibaba.nacos.api.NacosFactory;
-import com.alibaba.nacos.api.PropertyKeyConst;
-import com.alibaba.nacos.api.config.ConfigService;
-import com.alibaba.nacos.api.config.listener.AbstractSharedListener;
-import com.alibaba.nacos.api.exception.NacosException;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
 import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent;
@@ -38,6 +33,12 @@ import 
org.apache.dubbo.metrics.config.event.ConfigCenterEvent;
 import org.apache.dubbo.metrics.event.MetricsEventBus;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
+import com.alibaba.nacos.api.NacosFactory;
+import com.alibaba.nacos.api.PropertyKeyConst;
+import com.alibaba.nacos.api.config.ConfigService;
+import com.alibaba.nacos.api.config.listener.AbstractSharedListener;
+import com.alibaba.nacos.api.exception.NacosException;
+
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -107,11 +108,15 @@ public class NacosDynamicConfiguration implements 
DynamicConfiguration {
         try {
             for (int i = 0; i < retryTimes + 1; i++) {
                 tmpConfigServices = 
NacosFactory.createConfigService(nacosProperties);
-                if (!check || (UP.equals(tmpConfigServices.getServerStatus()) 
&& testConfigService(tmpConfigServices))) {
+                String serverStatus = tmpConfigServices.getServerStatus();
+                boolean configServiceAvailable = 
testConfigService(tmpConfigServices);
+                if (!check || (UP.equals(serverStatus) && 
configServiceAvailable)) {
                     break;
                 } else {
                     logger.warn(LoggerCodeConstants.CONFIG_ERROR_NACOS, "", "",
                         "Failed to connect to nacos config server. " +
+                            "Server status: " + serverStatus + ". " +
+                            "Config Service Available: " + 
configServiceAvailable + ". " +
                             (i < retryTimes ? "Dubbo will try to retry in " + 
sleepMsBetweenRetries + ". " : "Exceed retry max times.") +
                             "Try times: " + (i + 1));
                 }
diff --git 
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosConnectionManager.java
 
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosConnectionManager.java
index 2082abd2b0..2992d9677e 100644
--- 
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosConnectionManager.java
+++ 
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosConnectionManager.java
@@ -121,11 +121,15 @@ public class NacosConnectionManager {
         try {
             for (int i = 0; i < retryTimes + 1; i++) {
                 namingService = 
NacosFactory.createNamingService(nacosProperties);
-                if (!check || (UP.equals(namingService.getServerStatus()) && 
testNamingService(namingService))) {
+                String serverStatus = namingService.getServerStatus();
+                boolean namingServiceAvailable = 
testNamingService(namingService);
+                if (!check || (UP.equals(serverStatus) && 
namingServiceAvailable)) {
                     break;
                 } else {
                     logger.warn(LoggerCodeConstants.REGISTRY_NACOS_EXCEPTION, 
"", "",
                         "Failed to connect to nacos naming server. " +
+                            "Server status: " + serverStatus + ". " +
+                            "Naming Service Available: " + 
namingServiceAvailable + ". " +
                             (i < retryTimes ? "Dubbo will try to retry in " + 
sleepMsBetweenRetries + ". " : "Exceed retry max times.") +
                             "Try times: " + (i + 1));
                 }