This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 61d73896039a97074a893303ace428d087aa0016 Merge: 8c5e2b299f 1bc5e623c0 Author: Albumen Kevin <[email protected]> AuthorDate: Tue Aug 9 09:58:20 2022 +0800 Merge branch 'apache-3.0' into apache-3.1 README.md | 14 ++-- .../dubbo/common/cache/FileCacheStoreFactory.java | 11 ++- .../org/apache/dubbo/config/AbstractConfig.java | 66 +++++++++------ .../dubbo/config/AbstractReferenceConfig.java | 26 ++++++ .../org/apache/dubbo/config/ConsumerConfig.java | 13 --- .../apache/dubbo/config/ReferenceConfigBase.java | 35 ++------ .../org/apache/dubbo/config/RegistryConfig.java | 6 +- .../org/apache/dubbo/config/ServiceConfigBase.java | 11 ++- .../config/context/ConfigConfigurationAdapter.java | 9 +-- .../apache/dubbo/config/context/ConfigMode.java | 2 +- .../apache/dubbo/rpc/service/GenericException.java | 81 +++++++++++++++++++ .../apache/dubbo/config/AbstractConfigTest.java | 94 +++++++++++++++++++++- .../apache/dubbo/config/RegistryConfigTest.java | 10 ++- .../dubbo/metadata/AbstractCacheManager.java | 4 +- .../dubbo/metadata/AbstractServiceNameMapping.java | 10 ++- .../apache/dubbo/metadata/MappingCacheManager.java | 4 +- .../metadata/report/MetadataReportInstance.java | 2 + .../report/support/AbstractMetadataReport.java | 5 +- .../registry/client/AbstractServiceDiscovery.java | 18 ++++- .../listener/ServiceInstancesChangedListener.java | 6 +- .../client/metadata/store/MetaCacheManager.java | 6 +- .../zookeeper/util/CuratorFrameworkUtils.java | 14 ++++ .../curator5/Curator5ZookeeperClient.java | 14 ++++ .../zookeeper/curator/CuratorZookeeperClient.java | 14 ++++ .../java/org/apache/dubbo/rpc/RpcInvocation.java | 2 +- .../dubbo/rpc/proxy/InvokerInvocationHandler.java | 14 ++-- .../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 90 ++++++++++----------- .../dubbo/rpc/protocol/tri/TripleProtocol.java | 3 +- .../event/WelcomeLogoApplicationListener.java | 4 - .../apache/dubbo/spring/boot/util/DubboUtils.java | 6 +- .../dubbo/spring/boot/util/DubboUtilsTest.java | 6 +- 31 files changed, 425 insertions(+), 175 deletions(-) diff --cc dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java index 91709c949d,f58e9acdd8..cc311fac90 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java @@@ -174,16 -168,16 +174,20 @@@ public class ServiceInstancesChangedLis // cancel last retryFuture because only one retryFuture will be canceled at destroy(). retryFuture.cancel(true); } - retryFuture = scheduler.schedule(new AddressRefreshRetryTask(retryPermission, event.getServiceName()), 10_000L, TimeUnit.MILLISECONDS); + try { + retryFuture = scheduler.schedule(new AddressRefreshRetryTask(retryPermission, event.getServiceName()), 10_000L, TimeUnit.MILLISECONDS); + } catch (Exception e) { + logger.error("Error submitting async retry task."); + } logger.warn("Address refresh try task submitted"); } + // return if all metadata is empty, this notification will not take effect. if (emptyNum == revisionToInstances.size()) { - logger.error("Address refresh failed because of Metadata Server failure, wait for retry or new address refresh event."); + // 1-17 - Address refresh failed. + logger.error("1-17", "metadata Server failure", "", + "Address refresh failed because of Metadata Server failure, wait for retry or new address refresh event."); + return; } }
