You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ts...@apache.org on 2020/01/21 13:24:26 UTC
[dubbo] branch master updated: [Dubbo-5688] Fix timeout error when
publish config to nacos (#5689)
This is an automated email from the ASF dual-hosted git repository.
tswstarplanet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new e234a89 [Dubbo-5688] Fix timeout error when publish config to nacos (#5689)
e234a89 is described below
commit e234a8919a85922a99413a77f5eba370d62c665a
Author: Lei Jiang <53...@users.noreply.github.com>
AuthorDate: Tue Jan 21 21:23:41 2020 +0800
[Dubbo-5688] Fix timeout error when publish config to nacos (#5689)
* Fix timeout bug when publish config to nacos
* Add test case for publishConfig info
---
.../support/nacos/NacosDynamicConfiguration.java | 2 +-
.../support/nacos/NacosDynamicConfigurationTest.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
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 fb92a49..b39a4ce 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
@@ -260,7 +260,7 @@ public class NacosDynamicConfiguration implements DynamicConfiguration {
boolean published = false;
String resolvedGroup = resolveGroup(group);
try {
- String value = configService.getConfig(key, resolvedGroup, -1L);
+ String value = configService.getConfig(key, resolvedGroup, DEFAULT_TIMEOUT);
if (StringUtils.isNotEmpty(value)) {
content = value + "," + content;
}
diff --git a/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
index ac2978d..afafc1c 100644
--- a/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
+++ b/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
@@ -36,6 +36,9 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.concurrent.CountDownLatch;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Unit test for nacos config center support
@@ -140,6 +143,16 @@ public class NacosDynamicConfigurationTest {
}
}
+ @Test
+ public void testPublishConfig() {
+ String key = "user-service";
+ String group = "org.apache.dubbo.service.UserService";
+ String content = "test";
+
+ assertTrue(config.publishConfig(key, group, content));
+ assertEquals("test", config.getProperties(key, group));
+ }
+
@AfterAll
public static void tearDown() {