[dubbo] branch master updated: some unit fix about nacos (#7354)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj 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 a5859d1  some unit fix about nacos (#7354)
a5859d1 is described below

commit a5859d1be560fb4c5fad2324c878e16d14335e98
Author: 赵延 <1060026...@qq.com>
AuthorDate: Wed Mar 10 14:07:31 2021 +0800

    some unit fix about nacos (#7354)
---
 .../src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java | 2 +-
 .../java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index a6abda9..2fd206e 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -1174,7 +1174,7 @@ public class DubboBootstrap extends GenericEventListener {
             InMemoryWritableMetadataService localMetadataService = 
(InMemoryWritableMetadataService) WritableMetadataService.getDefaultExtension();
             localMetadataService.blockUntilUpdated();
             ServiceInstanceMetadataUtils.refreshMetadataAndInstance();
-        }, 0, ConfigurationUtils.get(METADATA_PUBLISH_DELAY_KEY, 
DEFAULT_METADATA_PUBLISH_DELAY), TimeUnit.MICROSECONDS);
+        }, 0, ConfigurationUtils.get(METADATA_PUBLISH_DELAY_KEY, 
DEFAULT_METADATA_PUBLISH_DELAY), TimeUnit.MILLISECONDS);
     }
 
     private void doRegisterServiceInstance(ServiceInstance serviceInstance) {
diff --git 
a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java
 
b/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java
index 707d2b8..734f7a0 100644
--- 
a/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java
+++ 
b/dubbo-metadata/dubbo-metadata-report-nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReport.java
@@ -225,7 +225,7 @@ public class NacosMetadataReport extends 
AbstractMetadataReport {
 
     private String getConfig(BaseMetadataIdentifier identifier) {
         try {
-            return 
configService.getConfig(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), group, 
300);
+            return 
configService.getConfig(identifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), group, 
3000L);
         } catch (Throwable t) {
             logger.error("Failed to get " + identifier + " from nacos , cause: 
" + t.getMessage(), t);
             throw new RpcException("Failed to get " + identifier + " from 
nacos , cause: " + t.getMessage(), t);