natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some nacos connection logs (#12494)

This commit is contained in:
Albumen Kevin 2023-06-12 10:10:19 +08:00 committed by GitHub
parent c7a69a60a8
commit 8a2dffd55e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
View File

@ -17,11 +17,6 @@
package org.apache.dubbo.configcenter.support.nacos; 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.URL;
import org.apache.dubbo.common.config.configcenter.ConfigChangeType; import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent; 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.metrics.event.MetricsEventBus;
import org.apache.dubbo.rpc.model.ApplicationModel; 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.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
@ -107,11 +108,15 @@ public class NacosDynamicConfiguration implements DynamicConfiguration {
try { try {
for (int i = 0; i < retryTimes + 1; i++) { for (int i = 0; i < retryTimes + 1; i++) {
tmpConfigServices = NacosFactory.createConfigService(nacosProperties); 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; break;
} else { } else {
logger.warn(LoggerCodeConstants.CONFIG_ERROR_NACOS, "", "", logger.warn(LoggerCodeConstants.CONFIG_ERROR_NACOS, "", "",
"Failed to connect to nacos config server. " + "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.") + (i < retryTimes ? "Dubbo will try to retry in " + sleepMsBetweenRetries + ". " : "Exceed retry max times.") +
"Try times: " + (i + 1)); "Try times: " + (i + 1));
} }

6
dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosConnectionManager.java
View File

@ -121,11 +121,15 @@ public class NacosConnectionManager {
try { try {
for (int i = 0; i < retryTimes + 1; i++) { for (int i = 0; i < retryTimes + 1; i++) {
namingService = NacosFactory.createNamingService(nacosProperties); 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; break;
} else { } else {
logger.warn(LoggerCodeConstants.REGISTRY_NACOS_EXCEPTION, "", "", logger.warn(LoggerCodeConstants.REGISTRY_NACOS_EXCEPTION, "", "",
"Failed to connect to nacos naming server. " + "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.") + (i < retryTimes ? "Dubbo will try to retry in " + sleepMsBetweenRetries + ". " : "Exceed retry max times.") +
"Try times: " + (i + 1)); "Try times: " + (i + 1));
} }