You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2019/08/12 09:10:37 UTC

[dubbo] branch cloud-native updated: Dubbo cloud native (#4797)

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

mercyblitz pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/cloud-native by this push:
     new b2f3307  Dubbo cloud native (#4797)
b2f3307 is described below

commit b2f330717c19dc3cb7e3df589694d986182163ae
Author: Mercy Ma <me...@gmail.com>
AuthorDate: Mon Aug 12 17:10:24 2019 +0800

    Dubbo cloud native (#4797)
    
    * Polish apache/dubbo#4542 : [Enhancement] Adapt the Java standard Event/Listener mechanism
    
    * Polish apache/dubbo#4541 : [Feature] Add local File System DynamicConfigurationFactory‘s extension
    
    * Polish apache#4541 : Bugfix
    
    * Polish apache/dubbo#4541 : Optimization
    
    * Polish apache/dubbo#4541 : Add the compatibility for PollingWatchService on the some platforms
    
    * Polish apache/dubbo#4541 : Add delay publish without ThreadPoolExecutor
    
    * Polish apache/dubbo#4541 : Refactor the extension name
    
    * Polish apache/dubbo#4541 : Add remove ops
    
    * Polish apache/dubbo#4541 : Add testable constructor
    
    * Polish apache/dubbo#4541 : Add getConfigGroups method
    
    * Polish apache/dubbo#4610 : [Refactor] Refactor the bootstrap module
    
    * Polish apache/dubbo#4541 : Fix the nulling URL issue
    
    * Polish apache/dubbo#4622 : [Refactor] Refactor ConfigManager
    
    * Polish apache/dubbo#4622 : [Refactor] Refactor ConfigManager
    
    * Polish apache/dubbo#4622 : Support multiple configcenters
    
    * Polish apache/dubbo#4671 : ServiceNameMapping will not map the group, version and protocol
    
    * update referenceCount log (#4683)
    
    Add comments to support multiple shared connections
    
    * Polish /apache/dubbo#4687 : Remove the duplicated test code in dubbo-config-spring (#4688)
    
    * #4685  修改代码if判断false问题 if (hasException == false)修改成if (!hasException) (#4695)
    
    * Fixed Service annotation method parameters are not in effect (#4598)
    
    * keep demo simple, and switch to use zookeeper as registry center (#4705)
    
    * keep demo simple, and switch to use zookeeper as registry center
    
    * remove comment
    
    * @Reference auto-wires the instance of generic interface #4594 (#4677)
    
    * try to shorten maven output to make travis build pass (#4710)
    
    * use CountDownLatch to check zk registry if establish connection (#4589)
    
    * Minor change
    
    * Rename the extension name of WritableMetadataService
    
    * Polish apache/dubbo#4759 : [Refactor] Change the signature of methods of MetadataService #4759
    
    * Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native
    
    # Conflicts:
    #	dubbo-all/pom.xml
    #	dubbo-bom/pom.xml
    #	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
    #	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
    #	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
    #	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
    #	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
    #	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
    #	dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
    #	dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java
    #	dubbo-configcenter/dubbo-configcenter-api/src/test/java/org/apache/dubbo/configcenter/mock/MockDynamicConfiguration.java
    #	dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
    #	dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java
    #	dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
    #	dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
    #	dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
    #	dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/model/MethodDefinition.java
    #	dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifier.java
    #	dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
    #	dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifierTest.java
    #	dubbo-metadata/dubbo-metadata-definition-protobuf/src/main/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilder.java
    #	dubbo-metadata/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilderTest.java
    #	dubbo-metadata/pom.xml
    #	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java
    #	dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
    #	dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
    #	dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java
    
    * Polish apache/dubbo#3984 : Add the implementation of Page<ServiceInstance> getInstances(String serviceName, int offset, int pageSize, boolean healthyOnly)
    
    * Code merge
    
    * Fix the cases
    
    * Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud-native
    
    # Conflicts:
    #	dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
    #	dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
    #	dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java
    #	dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java
    #	dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
    
    * Refactor ConfigManager
    
    * Refactor ConfigManager
---
 .../configcenter/AbstractDynamicConfiguration.java |  52 ++++--
 .../config/configcenter/DynamicConfiguration.java  |   3 +
 .../file/FileSystemDynamicConfiguration.java       | 101 +++---------
 .../org/apache/dubbo/config/AbstractConfig.java    |  15 ++
 .../apache/dubbo/config/context/ConfigManager.java | 182 ++++++++++++---------
 .../ConfigurableMetadataServiceExporter.java       |   1 -
 .../dubbo/metadata/MetadataServiceExporter.java    |   1 -
 .../dubbo-metadata-definition-protobuf/pom.xml     |   3 +-
 .../metadata/RefreshServiceMetadataCustomizer.java |   1 -
 .../registry/consul/AbstractConsulRegistry.java    |   4 -
 .../registry/consul/ConsulServiceDiscovery.java    |   8 -
 .../dubbo/registry/etcd/EtcdServiceDiscovery.java  |   1 -
 12 files changed, 192 insertions(+), 180 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
index 3b7d3b3..e692733 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java
@@ -23,11 +23,10 @@ import org.apache.dubbo.common.utils.NamedThreadFactory;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.concurrent.Executors.newFixedThreadPool;
-
 /**
  * The abstract implementation of {@link DynamicConfiguration}
  *
@@ -39,11 +38,21 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati
 
     public static final String THREAD_POOL_PREFIX_PARAM_NAME = PARAM_NAME_PREFIX + "thread-pool.prefix";
 
+    public static final String DEFAULT_THREAD_POOL_PREFIX = PARAM_NAME_PREFIX + "workers";
+
     public static final String THREAD_POOL_SIZE_PARAM_NAME = PARAM_NAME_PREFIX + "thread-pool.size";
 
-    public static final String DEFAULT_THREAD_POOL_PREFIX = PARAM_NAME_PREFIX + "workers";
+    /**
+     * The keep alive time in milliseconds for threads in {@link ThreadPoolExecutor}
+     */
+    public static final String THREAD_POOL_KEEP_ALIVE_TIME_PARAM_NAME = PARAM_NAME_PREFIX + "thread-pool.keep-alive-time";
+
+    public static final int DEFAULT_THREAD_POOL_SIZE = 1;
 
-    public static final String DEFAULT_THREAD_POOL_SIZE = "1";
+    /**
+     * Default keep alive time in milliseconds for threads in {@link ThreadPoolExecutor} is 1 minute( 60 * 1000 ms)
+     */
+    public static final long DEFAULT_THREAD_POOL_KEEP_ALIVE_TIME = TimeUnit.MINUTES.toMillis(1);
 
     /**
      * Logger
@@ -55,8 +64,18 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati
      */
     private final ThreadPoolExecutor workersThreadPool;
 
+    public AbstractDynamicConfiguration() {
+        this(DEFAULT_THREAD_POOL_PREFIX, DEFAULT_THREAD_POOL_SIZE, DEFAULT_THREAD_POOL_KEEP_ALIVE_TIME);
+    }
+
     public AbstractDynamicConfiguration(URL url) {
-        this.workersThreadPool = initWorkersThreadPool(url);
+        this(getThreadPoolPrefixName(url), getThreadPoolSize(url), getThreadPoolKeepAliveTime(url));
+    }
+
+    public AbstractDynamicConfiguration(String threadPoolPrefixName,
+                                        int threadPoolSize,
+                                        long keepAliveTime) {
+        this.workersThreadPool = initWorkersThreadPool(threadPoolPrefixName, threadPoolSize, keepAliveTime);
     }
 
     @Override
@@ -94,9 +113,9 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati
      * @param key   the key
      * @param group the group
      * @return if found, return the content of configuration
-     * @throws IllegalStateException
+     * @throws Exception If met with some problems
      */
-    protected abstract String doGetConfig(String key, String group) throws IllegalStateException;
+    protected abstract String doGetConfig(String key, String group) throws Exception;
 
     /**
      * Close the resources if necessary
@@ -144,6 +163,10 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati
         return value;
     }
 
+    protected ThreadPoolExecutor getWorkersThreadPool() {
+        return workersThreadPool;
+    }
+
     private void doFinally() {
         shutdownWorkersThreadPool();
     }
@@ -154,10 +177,11 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati
         }
     }
 
-    protected ThreadPoolExecutor initWorkersThreadPool(URL url) {
-        int size = getThreadPoolSize(url);
-        String name = getThreadPoolPrefixName(url);
-        return (ThreadPoolExecutor) newFixedThreadPool(size, new NamedThreadFactory(name));
+    protected ThreadPoolExecutor initWorkersThreadPool(String threadPoolPrefixName,
+                                                       int threadPoolSize,
+                                                       long keepAliveTime) {
+        return new ThreadPoolExecutor(threadPoolSize, threadPoolSize, keepAliveTime,
+                TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory(threadPoolPrefixName));
     }
 
     protected static String getThreadPoolPrefixName(URL url) {
@@ -165,7 +189,11 @@ public abstract class AbstractDynamicConfiguration implements DynamicConfigurati
     }
 
     protected static int getThreadPoolSize(URL url) {
-        return Integer.parseInt(getParameter(url, THREAD_POOL_SIZE_PARAM_NAME, DEFAULT_THREAD_POOL_SIZE));
+        return url.getParameter(THREAD_POOL_SIZE_PARAM_NAME, DEFAULT_THREAD_POOL_SIZE);
+    }
+
+    protected static long getThreadPoolKeepAliveTime(URL url) {
+        return url.getParameter(THREAD_POOL_KEEP_ALIVE_TIME_PARAM_NAME, DEFAULT_THREAD_POOL_KEEP_ALIVE_TIME);
     }
 
     protected static String getParameter(URL url, String name, String defaultValue) {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java
index 777f50b..e3b54d8 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java
@@ -39,7 +39,10 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
  * <li>{@link #addListener(String, String, ConfigurationListener)}/ {@link #removeListener(String, String, ConfigurationListener)}
  * , add or remove listeners for governance rules or config items that need to watch.</li>
  * <li>{@link #getProperty(String, Object)}, get a single config item.</li>
+ * <li>{@link #getConfig(String, String, long)}, get the specified config</li>
  * </ol>
+ *
+ * @see AbstractDynamicConfiguration
  */
 public interface DynamicConfiguration extends Configuration, AutoCloseable {
 
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
index 715fd87..3070c1f 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.common.config.configcenter.file;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.config.configcenter.AbstractDynamicConfiguration;
 import org.apache.dubbo.common.config.configcenter.ConfigChangeEvent;
 import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
 import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
@@ -51,10 +52,8 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -66,7 +65,6 @@ import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.unmodifiableMap;
-import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.commons.io.FileUtils.readFileToString;
@@ -77,23 +75,15 @@ import static org.apache.dubbo.common.utils.StringUtils.isBlank;
  *
  * @since 2.7.4
  */
-public class FileSystemDynamicConfiguration implements DynamicConfiguration {
-
-    public static final String PARAM_NAME_PREFIX = "dubbo.config-center.";
+public class FileSystemDynamicConfiguration extends AbstractDynamicConfiguration {
 
     public static final String CONFIG_CENTER_DIR_PARAM_NAME = PARAM_NAME_PREFIX + "dir";
 
-    public static final String THREAD_POOL_PREFIX_PARAM_NAME = PARAM_NAME_PREFIX + "thread-pool.prefix";
-
-    public static final String THREAD_POOL_SIZE_PARAM_NAME = PARAM_NAME_PREFIX + "thread-pool.size";
-
     public static final String CONFIG_CENTER_ENCODING_PARAM_NAME = PARAM_NAME_PREFIX + "encoding";
 
     public static final String DEFAULT_CONFIG_CENTER_DIR_PATH = System.getProperty("user.home") + File.separator
             + ".dubbo" + File.separator + "config-center";
 
-    public static final String DEFAULT_THREAD_POOL_PREFIX = PARAM_NAME_PREFIX + "workers";
-
     public static final String DEFAULT_THREAD_POOL_SIZE = "1";
 
     public static final String DEFAULT_CONFIG_CENTER_ENCODING = "UTF-8";
@@ -112,6 +102,7 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
      */
     private static final Log logger = LogFactory.getLog(FileSystemDynamicConfiguration.class);
 
+
     /**
      * The unmodifiable map for {@link ConfigChangeType} whose key is the {@link WatchEvent.Kind#name() name} of
      * {@link WatchEvent.Kind WatchEvent's Kind}
@@ -167,11 +158,6 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
     private final String encoding;
 
     /**
-     * The thread pool for workers who executes the tasks
-     */
-    private final ThreadPoolExecutor workersThreadPool;
-
-    /**
      * The {@link Set} of {@link #configDirectory(String) directories} that may be processing,
      * <p>
      * if {@link #isBasedPoolingWatchService()} is <code>false</code>, this properties will be
@@ -184,16 +170,17 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
     private final Map<File, List<ConfigurationListener>> listenersRepository;
 
     public FileSystemDynamicConfiguration(URL url) {
-        this(initDirectory(url), getEncoding(url), getThreadPoolPrefixName(url), getThreadPoolSize(url));
+        this(initDirectory(url), getEncoding(url), getThreadPoolPrefixName(url), getThreadPoolSize(url),
+                getThreadPoolKeepAliveTime(url));
     }
 
     public FileSystemDynamicConfiguration(File rootDirectory, String encoding,
                                           String threadPoolPrefixName,
-                                          int threadPoolSize
-    ) {
+                                          int threadPoolSize,
+                                          long keepAliveTime) {
+        super(threadPoolPrefixName, threadPoolSize, keepAliveTime);
         this.rootDirectory = rootDirectory;
         this.encoding = encoding;
-        this.workersThreadPool = initWorkersThreadPool(threadPoolPrefixName, threadPoolSize);
         this.processingDirectories = initProcessingDirectories();
         this.listenersRepository = new LinkedHashMap<>();
     }
@@ -231,12 +218,6 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
         });
     }
 
-    @Override
-    public String getConfig(String key, String group, long timeout) throws IllegalStateException {
-        File configFile = configFile(key, group);
-        return getConfig(configFile, timeout);
-    }
-
     protected File configDirectory(String group) {
         String actualGroup = isBlank(group) ? DEFAULT_GROUP : group;
         return new File(rootDirectory, actualGroup);
@@ -335,7 +316,7 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
 
     private void fireConfigChangeEvent(File configFile, ConfigChangeType configChangeType) {
         String key = configFile.getName();
-        String value = getConfig(configFile, -1L);
+        String value = getConfig(configFile);
         // fire ConfigChangeEvent one by one
         getListeners(configFile).forEach(listener -> {
             try {
@@ -348,10 +329,6 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
         });
     }
 
-    protected String getConfig(File configFile, long timeout) {
-        return canRead(configFile) ? execute(() -> readFileToString(configFile, getEncoding()), timeout) : null;
-    }
-
     private boolean canRead(File file) {
         return file.exists() && file.canRead();
     }
@@ -373,7 +350,7 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
     public String removeConfig(String key, String group) {
         return delay(key, group, configFile -> {
 
-            String content = getConfig(configFile, -1L);
+            String content = getConfig(configFile);
 
             FileUtils.deleteQuietly(configFile);
 
@@ -381,10 +358,6 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
         });
     }
 
-    private ThreadPoolExecutor initWorkersThreadPool(String prefix, int size) {
-        return (ThreadPoolExecutor) newFixedThreadPool(size, new NamedThreadFactory(prefix));
-    }
-
     /**
      * Delay action for {@link #configFile(String, String) config file}
      *
@@ -470,36 +443,25 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
     }
 
     @Override
-    public void close() throws Exception {
-        // TODO
+    protected String doGetConfig(String key, String group) throws Exception {
+        File configFile = configFile(key, group);
+        return getConfig(configFile);
     }
 
-    private <V> V execute(Callable<V> task, long timeout) {
-        V value = null;
-        try {
+    protected String getConfig(File configFile) {
+        return ThrowableFunction.execute(configFile,
+                file -> canRead(configFile) ? readFileToString(configFile, getEncoding()) : null);
+    }
+
+    @Override
+    protected void doClose() throws Exception {
 
-            if (timeout < 1) { // less or equal 0
-                value = task.call();
-            } else {
-                Future<V> future = workersThreadPool.submit(task);
-                value = future.get(timeout, TimeUnit.MILLISECONDS);
-            }
-        } catch (Exception e) {
-            if (logger.isErrorEnabled()) {
-                logger.error(e.getMessage(), e);
-            }
-        }
-        return value;
     }
 
     protected File getRootDirectory() {
         return rootDirectory;
     }
 
-    protected ThreadPoolExecutor getWorkersThreadPool() {
-        return workersThreadPool;
-    }
-
     protected String getEncoding() {
         return encoding;
     }
@@ -520,14 +482,14 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
         return basedPoolingWatchService;
     }
 
-    private static String getThreadPoolPrefixName(URL url) {
-        return getParameter(url, THREAD_POOL_PREFIX_PARAM_NAME, DEFAULT_THREAD_POOL_PREFIX);
-    }
-
     protected static ThreadPoolExecutor getWatchEventsLoopThreadPool() {
         return watchEventsLoopThreadPool;
     }
 
+    protected ThreadPoolExecutor getWorkersThreadPool() {
+        return super.getWorkersThreadPool();
+    }
+
     private <V> V executeMutually(Object mutex, Callable<V> callable) {
         V value = null;
         synchronized (mutex) {
@@ -592,7 +554,7 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
         return watchService;
     }
 
-    private static File initDirectory(URL url) {
+    protected static File initDirectory(URL url) {
         String directoryPath = getParameter(url, CONFIG_CENTER_DIR_PARAM_NAME, DEFAULT_CONFIG_CENTER_DIR_PATH);
         File rootDirectory = new File(getParameter(url, CONFIG_CENTER_DIR_PARAM_NAME, DEFAULT_CONFIG_CENTER_DIR_PATH));
         if (!rootDirectory.exists() && !rootDirectory.mkdirs()) {
@@ -602,21 +564,10 @@ public class FileSystemDynamicConfiguration implements DynamicConfiguration {
         return rootDirectory;
     }
 
-    private static String getParameter(URL url, String name, String defaultValue) {
-        if (url != null) {
-            return url.getParameter(name, defaultValue);
-        }
-        return defaultValue;
-    }
-
-    private static String getEncoding(URL url) {
+    protected static String getEncoding(URL url) {
         return getParameter(url, CONFIG_CENTER_ENCODING_PARAM_NAME, DEFAULT_CONFIG_CENTER_ENCODING);
     }
 
-    private static int getThreadPoolSize(URL url) {
-        return Integer.parseInt(getParameter(url, THREAD_POOL_SIZE_PARAM_NAME, DEFAULT_THREAD_POOL_SIZE));
-    }
-
     private static ThreadPoolExecutor newWatchEventsLoopThreadPool() {
         return new ThreadPoolExecutor(THREAD_POOL_SIZE, THREAD_POOL_SIZE,
                 0L, MILLISECONDS,
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
index ccac941..c1a7548 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
@@ -30,9 +30,11 @@ import org.apache.dubbo.common.utils.MethodUtils;
 import org.apache.dubbo.common.utils.ReflectUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.config.context.ConfigConfigurationAdapter;
+import org.apache.dubbo.config.context.ConfigManager;
 import org.apache.dubbo.config.support.Parameter;
 import org.apache.dubbo.rpc.model.ConsumerMethodModel;
 
+import javax.annotation.PostConstruct;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -646,4 +648,17 @@ public abstract class AbstractConfig implements Serializable {
         }
         return true;
     }
+
+    /**
+     * Add {@link AbstractConfig current instance} into {@link ConfigManager}
+     * <p>
+     * Current method will invoked by Spring or Java EE container automatically, or should be triggered manually.
+     *
+     * @see ConfigManager#addConfig(AbstractConfig)
+     * @since 2.7.4
+     */
+    @PostConstruct
+    public void addIntoConfigManager() {
+        ConfigManager.getInstance().addConfig(this);
+    }
 }
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 56abecc..a7a3796 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -41,11 +41,11 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.StampedLock;
 import java.util.stream.Collectors;
 
 import static java.lang.Boolean.TRUE;
+import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableSet;
 import static java.util.Optional.ofNullable;
 import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
@@ -94,19 +94,7 @@ public class ConfigManager {
 
     private static final ConfigManager CONFIG_MANAGER = new ConfigManager();
 
-    private volatile ModuleConfig module;
-    private volatile ApplicationConfig application;
-    private volatile MonitorConfig monitor;
-    private volatile MetricsConfig metrics;
-
-    private final Map<String, ProtocolConfig> protocols = new ConcurrentHashMap<>();
-    private final Map<String, RegistryConfig> registries = new ConcurrentHashMap<>();
-    private final Map<String, ProviderConfig> providers = new ConcurrentHashMap<>();
-    private final Map<String, ConsumerConfig> consumers = new ConcurrentHashMap<>();
-    private final Map<String, ConfigCenterConfig> configCenters = new ConcurrentHashMap<>();
-    private final Map<String, MetadataReportConfig> metadataConfigs = new ConcurrentHashMap<>();
-    private final Map<String, ServiceConfig<?>> serviceConfigs = new ConcurrentHashMap<>();
-    private final Map<String, ReferenceConfig<?>> referenceConfigs = new ConcurrentHashMap<>();
+    private final Map<Class<? extends AbstractConfig>, Map<String, AbstractConfig>> configsCache = newMap();
 
     private final StampedLock lock = new StampedLock();
 
@@ -120,57 +108,93 @@ public class ConfigManager {
     // ApplicationConfig correlative methods
 
     public void setApplication(ApplicationConfig application) {
-        if (application != null) {
-            checkDuplicate(this.application, application);
-            this.application = application;
-        }
+        addConfig(application, true);
     }
 
     public Optional<ApplicationConfig> getApplication() {
-        return ofNullable(application);
+        return ofNullable(getConfig(ApplicationConfig.class));
+    }
+
+    /**
+     * Add the dubbo {@link AbstractConfig config}
+     *
+     * @param config the dubbo {@link AbstractConfig config}
+     */
+    public void addConfig(AbstractConfig config) {
+        addConfig(config, false);
+    }
+
+    protected void addConfig(AbstractConfig config, boolean unique) {
+        Class<? extends AbstractConfig> configType = config.getClass();
+        write(() -> {
+            Map<String, AbstractConfig> configsMap = configsCache.computeIfAbsent(configType, type -> newMap());
+            addIfAbsent(config, configsMap, unique);
+        });
+    }
+
+    protected <C extends AbstractConfig> Map<String, C> getConfigsMap(Class<? extends C> configType) {
+        return read(() -> (Map) configsCache.getOrDefault(configType, emptyMap()));
+    }
+
+    protected <C extends AbstractConfig> Collection<C> getConfigs(Class<C> configType) {
+        return read(() -> getConfigsMap(configType).values());
+    }
+
+    protected <C extends AbstractConfig> C getConfig(Class<C> configType, String id) {
+        return read(() -> {
+            Map<String, C> configsMap = (Map) configsCache.getOrDefault(configType, emptyMap());
+            return configsMap.get(id);
+        });
+    }
+
+    protected <C extends AbstractConfig> C getConfig(Class<C> configType) throws IllegalStateException {
+        return read(() -> {
+            Map<String, C> configsMap = (Map) configsCache.getOrDefault(configType, emptyMap());
+            int size = configsMap.size();
+            if (size < 0) {
+//                throw new IllegalStateException("No such " + configType.getName() + " is found");
+                return null;
+            } else if (size > 1) {
+                throw new IllegalStateException("The expected single matching " + configType.getName() + " but found " + size + " instances");
+            } else {
+                return configsMap.values().iterator().next();
+            }
+        });
     }
 
     // MonitorConfig correlative methods
 
     public void setMonitor(MonitorConfig monitor) {
-        if (monitor != null) {
-            checkDuplicate(this.monitor, monitor);
-            this.monitor = monitor;
-        }
+        addConfig(monitor, true);
     }
 
     public Optional<MonitorConfig> getMonitor() {
-        return ofNullable(monitor);
+        return ofNullable(getConfig(MonitorConfig.class));
     }
 
     // ModuleConfig correlative methods
 
     public void setModule(ModuleConfig module) {
-        if (module != null) {
-            checkDuplicate(this.module, module);
-            this.module = module;
-        }
+        addConfig(module, true);
+
     }
 
     public Optional<ModuleConfig> getModule() {
-        return ofNullable(module);
+        return ofNullable(getConfig(ModuleConfig.class));
     }
 
     public void setMetrics(MetricsConfig metrics) {
-        if (metrics != null) {
-            checkDuplicate(this.metrics, metrics);
-            this.metrics = metrics;
-        }
+        addConfig(metrics, true);
     }
 
     public Optional<MetricsConfig> getMetrics() {
-        return ofNullable(metrics);
+        return ofNullable(getConfig(MetricsConfig.class));
     }
 
     // ConfigCenterConfig correlative methods
 
     public void addConfigCenter(ConfigCenterConfig configCenter) {
-        addIfAbsent(configCenter, configCenters);
+        addConfig(configCenter);
     }
 
     public void addConfigCenters(Iterable<ConfigCenterConfig> configCenters) {
@@ -178,17 +202,17 @@ public class ConfigManager {
     }
 
     public ConfigCenterConfig getConfigCenter(String id) {
-        return configCenters.get(id);
+        return getConfig(ConfigCenterConfig.class, id);
     }
 
     public Collection<ConfigCenterConfig> getConfigCenters() {
-        return configCenters.values();
+        return getConfigs(ConfigCenterConfig.class);
     }
 
     // MetadataReportConfig correlative methods
 
     public void addMetadataReport(MetadataReportConfig metadataReportConfig) {
-        addIfAbsent(metadataReportConfig, metadataConfigs);
+        addConfig(metadataReportConfig);
     }
 
     public void addMetadataReports(Iterable<MetadataReportConfig> metadataReportConfigs) {
@@ -196,17 +220,17 @@ public class ConfigManager {
     }
 
     public Collection<MetadataReportConfig> getMetadataConfigs() {
-        return metadataConfigs.values();
+        return getConfigs(MetadataReportConfig.class);
     }
 
     // MetadataReportConfig correlative methods
 
     public void addProvider(ProviderConfig providerConfig) {
-        addIfAbsent(providerConfig, providers);
+        addConfig(providerConfig);
     }
 
     public Optional<ProviderConfig> getProvider(String id) {
-        return ofNullable(providers.get(id));
+        return ofNullable(getConfig(ProviderConfig.class, id));
     }
 
     public Optional<ProviderConfig> getDefaultProvider() {
@@ -214,17 +238,17 @@ public class ConfigManager {
     }
 
     public Collection<ProviderConfig> getProviders() {
-        return providers.values();
+        return getConfigs(ProviderConfig.class);
     }
 
     // ConsumerConfig correlative methods
 
     public void addConsumer(ConsumerConfig consumerConfig) {
-        addIfAbsent(consumerConfig, consumers);
+        addConfig(consumerConfig);
     }
 
     public Optional<ConsumerConfig> getConsumer(String id) {
-        return ofNullable(consumers.get(id));
+        return ofNullable(getConfig(ConsumerConfig.class, id));
     }
 
     public Optional<ConsumerConfig> getDefaultConsumer() {
@@ -232,13 +256,13 @@ public class ConfigManager {
     }
 
     public Collection<ConsumerConfig> getConsumers() {
-        return consumers.values();
+        return getConfigs(ConsumerConfig.class);
     }
 
     // ProtocolConfig correlative methods
 
     public void addProtocol(ProtocolConfig protocolConfig) {
-        addIfAbsent(protocolConfig, protocols);
+        addConfig(protocolConfig);
     }
 
     public void addProtocols(Iterable<ProtocolConfig> protocolConfigs) {
@@ -248,15 +272,15 @@ public class ConfigManager {
     }
 
     public Optional<ProtocolConfig> getProtocol(String id) {
-        return ofNullable(protocols.get(id));
+        return ofNullable(getConfig(ProtocolConfig.class, id));
     }
 
     public List<ProtocolConfig> getDefaultProtocols() {
-        return getDefaultConfigs(protocols);
+        return getDefaultConfigs(getConfigsMap(ProtocolConfig.class));
     }
 
     public Collection<ProtocolConfig> getProtocols() {
-        return protocols.values();
+        return getConfigs(ProtocolConfig.class);
     }
 
     public Set<String> getProtocolIds() {
@@ -266,7 +290,7 @@ public class ConfigManager {
         protocolIds.addAll(getSubProperties(Environment.getInstance()
                 .getAppExternalConfigurationMap(), PROTOCOLS_SUFFIX));
 
-        protocolIds.addAll(protocols.keySet());
+        protocolIds.addAll(getConfigIds(ProtocolConfig.class));
         return unmodifiableSet(protocolIds);
     }
 
@@ -274,7 +298,7 @@ public class ConfigManager {
     // RegistryConfig correlative methods
 
     public void addRegistry(RegistryConfig registryConfig) {
-        addIfAbsent(registryConfig, registries);
+        addConfig(registryConfig);
     }
 
     public void addRegistries(Iterable<RegistryConfig> registryConfigs) {
@@ -284,15 +308,15 @@ public class ConfigManager {
     }
 
     public Optional<RegistryConfig> getRegistry(String id) {
-        return ofNullable(registries.get(id));
+        return ofNullable(getConfig(RegistryConfig.class, id));
     }
 
     public List<RegistryConfig> getDefaultRegistries() {
-        return getDefaultConfigs(registries);
+        return getDefaultConfigs(getConfigsMap(RegistryConfig.class));
     }
 
     public Collection<RegistryConfig> getRegistries() {
-        return registries.values();
+        return getConfigs(RegistryConfig.class);
     }
 
     public Set<String> getRegistryIds() {
@@ -302,36 +326,36 @@ public class ConfigManager {
         registryIds.addAll(getSubProperties(Environment.getInstance().getAppExternalConfigurationMap(),
                 REGISTRIES_SUFFIX));
 
-        registryIds.addAll(registries.keySet());
+        registryIds.addAll(getConfigIds(RegistryConfig.class));
         return unmodifiableSet(registryIds);
     }
 
     // ServiceConfig correlative methods
 
     public void addService(ServiceConfig<?> serviceConfig) {
-        addIfAbsent(serviceConfig, serviceConfigs);
+        addConfig(serviceConfig);
     }
 
-    public Collection<ServiceConfig<?>> getServiceConfigs() {
-        return serviceConfigs.values();
+    public Collection<ServiceConfig> getServiceConfigs() {
+        return getConfigs(ServiceConfig.class);
     }
 
     public <T> ServiceConfig<T> getServiceConfig(String id) {
-        return (ServiceConfig<T>) serviceConfigs.get(id);
+        return getConfig(ServiceConfig.class, id);
     }
 
     // ReferenceConfig correlative methods
 
     public void addReference(ReferenceConfig<?> referenceConfig) {
-        addIfAbsent(referenceConfig, referenceConfigs);
+        addConfig(referenceConfig);
     }
 
-    public Collection<ReferenceConfig<?>> getReferenceConfigs() {
-        return referenceConfigs.values();
+    public Collection<ReferenceConfig> getReferenceConfigs() {
+        return getConfigs(ReferenceConfig.class);
     }
 
     public <T> ReferenceConfig<T> getReferenceConfig(String id) {
-        return (ReferenceConfig<T>) referenceConfigs.get(id);
+        return getConfig(ReferenceConfig.class, id);
     }
 
     protected static Set<String> getSubProperties(Map<String, String> properties, String prefix) {
@@ -360,18 +384,17 @@ public class ConfigManager {
     // For test purpose
     public void clear() {
         write(() -> {
-            this.application = null;
-            this.monitor = null;
-            this.module = null;
-            this.registries.clear();
-            this.protocols.clear();
-            this.providers.clear();
-            this.consumers.clear();
-            this.configCenters.clear();
-            this.metadataConfigs.clear();
+            this.configsCache.clear();
         });
     }
 
+    private <C extends AbstractConfig> Collection<String> getConfigIds(Class<C> configType) {
+        return getConfigs(configType)
+                .stream()
+                .map(AbstractConfig::getId)
+                .collect(Collectors.toSet());
+    }
+
     private <V> V write(Callable<V> callable) {
         V value = null;
         long stamp = lock.writeLock();
@@ -418,23 +441,30 @@ public class ConfigManager {
         return value;
     }
 
-    private static void checkDuplicate(AbstractConfig oldOne, AbstractConfig newOne) {
+    private static void checkDuplicate(AbstractConfig oldOne, AbstractConfig newOne) throws IllegalStateException {
         if (oldOne != null && !oldOne.equals(newOne)) {
             String configName = oldOne.getClass().getSimpleName();
             throw new IllegalStateException("Duplicate Config found for " + configName + ", you should use only one unique " + configName + " for one application.");
         }
     }
 
-    private static Map<Class<? extends AbstractConfig>, Map<String, ? extends AbstractConfig>> newMap() {
+    private static Map newMap() {
         return new HashMap<>();
     }
 
-    private static <C extends AbstractConfig> void addIfAbsent(C config, Map<String, C> configsMap) {
+    static <C extends AbstractConfig> void addIfAbsent(C config, Map<String, C> configsMap, boolean unique)
+            throws IllegalStateException {
 
-        if (config == null) {
+        if (config == null || configsMap == null) {
             return;
         }
 
+        if (unique) { // check duplicate
+            configsMap.values().forEach(c -> {
+                checkDuplicate(c, config);
+            });
+        }
+
         String key = getId(config);
 
         C existedConfig = configsMap.get(key);
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
index 8d24508..1e8c1f6 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -29,7 +29,6 @@ import org.apache.dubbo.config.context.ConfigManager;
 import org.apache.dubbo.metadata.MetadataService;
 import org.apache.dubbo.metadata.MetadataServiceExporter;
 import org.apache.dubbo.metadata.WritableMetadataService;
-import org.apache.dubbo.metadata.store.RemoteWritableMetadataService;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
index e256268..6ba99de 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
@@ -17,7 +17,6 @@
 package org.apache.dubbo.metadata;
 
 import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.extension.SPI;
 
 import java.util.List;
 
diff --git a/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml b/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
index 9e8c409..eb248b4 100644
--- a/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
+++ b/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
@@ -16,9 +16,10 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>dubbo-metadata</artifactId>
         <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-metadata</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dubbo-metadata-definition-protobuf</artifactId>
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java
index 5b2622e..441318e 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java
@@ -3,7 +3,6 @@ package org.apache.dubbo.registry.client.metadata;
 import org.apache.dubbo.metadata.WritableMetadataService;
 import org.apache.dubbo.registry.client.ServiceInstance;
 import org.apache.dubbo.registry.client.ServiceInstanceCustomizer;
-import org.apache.dubbo.registry.client.ServiceInstanceMetadataCustomizer;
 
 import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
 import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.EXPORTED_SERVICES_REVISION_KEY;
diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/AbstractConsulRegistry.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/AbstractConsulRegistry.java
index b8de1a8..468eee8 100644
--- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/AbstractConsulRegistry.java
+++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/AbstractConsulRegistry.java
@@ -1,9 +1,5 @@
 package org.apache.dubbo.registry.consul;
 
-import org.apache.dubbo.common.URL;
-
-import com.ecwid.consul.v1.agent.model.NewService;
-
 /**
  * @author cvictory ON 2019-08-02
  */
diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java
index 3f8f6bd..b4eee65 100644
--- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java
@@ -18,33 +18,25 @@ package org.apache.dubbo.registry.consul;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.utils.NamedThreadFactory;
-import org.apache.dubbo.event.EventDispatcher;
 import org.apache.dubbo.event.EventListener;
-import org.apache.dubbo.registry.NotifyListener;
 import org.apache.dubbo.registry.client.ServiceDiscovery;
 import org.apache.dubbo.registry.client.ServiceInstance;
 import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
 import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
 
 import com.ecwid.consul.v1.ConsulClient;
-import com.ecwid.consul.v1.Response;
 import com.ecwid.consul.v1.agent.model.NewService;
-import com.ecwid.consul.v1.health.model.HealthService;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static java.util.concurrent.Executors.newCachedThreadPool;
-import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE;
 import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.CHECK_PASS_INTERVAL;
 import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.DEFAULT_CHECK_PASS_INTERVAL;
 import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.DEFAULT_DEREGISTER_TIME;
diff --git a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
index 70fede0..a684c2c 100644
--- a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
@@ -38,7 +38,6 @@ import com.google.gson.Gson;
 
 import java.io.File;
 import java.util.Collections;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;