[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 <53557551+lad...@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() {
[dubbo-go] branch develop updated (f5c2390 -> 1fa4bf6)
This is an automated email from the ASF dual-hosted git repository. flycash pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from f5c2390 Merge branch 'develop' of https://github.com/apache/dubbo-go into develop new da6d29a Context support new e945c66 format code new a81c012 Fix review: context.TODO => context.Backgroud new ab69968 Fix review: split imports new 29c195d Fix Review new 1fa4bf6 Merge pull request #330 from flycash/feature/context The 1291 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: cluster/cluster_impl/available_cluster_invoker.go | 5 +++-- cluster/cluster_impl/available_cluster_invoker_test.go | 4 ++-- cluster/cluster_impl/broadcast_cluster_invoker.go | 7 +-- cluster/cluster_impl/broadcast_cluster_invoker_test.go | 4 ++-- cluster/cluster_impl/failback_cluster_invoker.go| 11 ++- cluster/cluster_impl/failback_cluster_test.go | 12 ++-- cluster/cluster_impl/failfast_cluster_invoker.go| 7 +-- cluster/cluster_impl/failfast_cluster_test.go | 4 ++-- cluster/cluster_impl/failover_cluster_invoker.go| 5 +++-- cluster/cluster_impl/failover_cluster_test.go | 10 +- cluster/cluster_impl/failsafe_cluster_invoker.go| 7 +-- cluster/cluster_impl/failsafe_cluster_test.go | 4 ++-- cluster/cluster_impl/forking_cluster_invoker.go | 5 +++-- cluster/cluster_impl/forking_cluster_test.go| 6 +++--- cluster/cluster_impl/registry_aware_cluster_invoker.go | 9 ++--- cluster/cluster_impl/registry_aware_cluster_test.go | 8 cluster/router/condition_router_test.go | 2 +- common/proxy/proxy.go | 3 ++- common/proxy/proxy_factory/default.go | 3 ++- filter/filter.go| 7 +-- filter/filter_impl/access_log_filter.go | 7 --- filter/filter_impl/access_log_filter_test.go| 6 +++--- filter/filter_impl/active_filter.go | 7 --- filter/filter_impl/active_filter_test.go| 4 ++-- filter/filter_impl/echo_filter.go | 9 ++--- filter/filter_impl/echo_filter_test.go | 7 +++ filter/filter_impl/execute_limit_filter.go | 9 + filter/filter_impl/execute_limit_filter_test.go | 7 --- filter/filter_impl/generic_filter.go| 9 + filter/filter_impl/generic_service_filter.go| 9 + filter/filter_impl/generic_service_filter_test.go | 6 +++--- filter/filter_impl/graceful_shutdown_filter.go | 7 --- filter/filter_impl/graceful_shutdown_filter_test.go | 5 +++-- filter/filter_impl/hystrix_filter.go| 9 + filter/filter_impl/hystrix_filter_test.go | 13 +++-- filter/filter_impl/token_filter.go | 9 + filter/filter_impl/token_filter_test.go | 17 + filter/filter_impl/tps_limit_filter.go | 11 +++ filter/filter_impl/tps_limit_filter_test.go | 17 +++-- protocol/dubbo/dubbo_invoker.go | 3 ++- protocol/dubbo/dubbo_invoker_test.go| 9 + protocol/dubbo/listener.go | 3 ++- protocol/grpc/common_test.go| 4 ++-- protocol/grpc/grpc_invoker.go | 2 +- protocol/grpc/grpc_invoker_test.go | 2 +- .../grpc/protoc-gen-dubbo/examples/helloworld.pb.go | 4 ++-- protocol/invoker.go | 7 +-- protocol/jsonrpc/jsonrpc_invoker.go | 6 +++--- protocol/jsonrpc/jsonrpc_invoker_test.go| 2 +- protocol/jsonrpc/server.go | 2 +- protocol/mock/mock_invoker.go | 3 ++- protocol/protocolwrapper/protocol_filter_wrapper.go | 7 --- .../protocolwrapper/protocol_filter_wrapper_test.go | 7 --- registry/protocol/protocol.go | 5 +++-- 54 files changed, 205 insertions(+), 152 deletions(-)
