create ConcurrentHashMap by CollectionUtils to avoid dead lock

Author: zrlw

dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/PeakEwmaLoadBalance.java

@@ -17,6 +17,7 @@
 package org.apache.dubbo.rpc.cluster.loadbalance;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.rpc.Invocation;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.RpcStatus;
@@ -25,8 +26,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -62,7 +62,7 @@ public void setApplicationModel(ApplicationModel applicationModel) {
         decayTime = applicationModel.getModelEnvironment().getConfiguration().getInt(PEAK_EWMA_DECAY_TIME, 10_000);
     }
 
-    private ConcurrentMap<RpcStatus, Metric> methodMap = new ConcurrentHashMap<>();
+    private Map<RpcStatus, Metric> methodMap = CollectionUtils.newConcurrentHashMap();
 
     protected static class Metric {
         // last timestamp in Millis we observed an runningTime

dubbo-configcenter-extensions/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java

@@ -41,8 +41,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
 
@@ -58,7 +56,7 @@ public class ConsulDynamicConfiguration extends TreePathDynamicConfiguration {
 
     private final int watchTimeout;
 
-    private final ConcurrentMap<String, ConsulListener> watchers = new ConcurrentHashMap<>();
+    private final Map<String, ConsulListener> watchers = CollectionUtils.newConcurrentHashMap();
 
     public ConsulDynamicConfiguration(URL url) {
         super(url);

dubbo-metadata-report-extensions/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java

@@ -456,7 +456,7 @@ public MappingDataListener getMappingDataListener() {
      */
     class NotifySub extends JedisPubSub {
 
-        private final Map<String, Set<MappingListener>> listeners = new ConcurrentHashMap<>();
+        private final Map<String, Set<MappingListener>> listeners = CollectionUtils.newConcurrentHashMap();
 
         public void addListener(String key, MappingListener listener) {
             Set<MappingListener> listenerSet = listeners.computeIfAbsent(key, k -> new ConcurrentHashSet<>());

dubbo-registry-extensions/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulRegistry.java

@@ -42,8 +42,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -76,7 +74,7 @@ public class ConsulRegistry extends FailbackRegistry {
     private long checkPassInterval;
     private ExecutorService notifierExecutor = newCachedThreadPool(
             new NamedThreadFactory("dubbo-consul-notifier", true));
-    private ConcurrentMap<URL, ConsulNotifier> notifiers = new ConcurrentHashMap<>();
+    private Map<URL, ConsulNotifier> notifiers = CollectionUtils.newConcurrentHashMap();
     private ScheduledExecutorService ttlConsulCheckExecutor;
     /**
      * The ACL token

dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/support/AbstractEtcdClient.java

@@ -36,6 +36,7 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.ConcurrentHashSet;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.remoting.etcd.ChildListener;
@@ -44,9 +45,8 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
 import static org.apache.dubbo.remoting.etcd.Constants.CONFIGURATORS_CATEGORY;
@@ -62,7 +62,7 @@ public abstract class AbstractEtcdClient<WatcherListener> implements EtcdClient
 
     private final Set<StateListener> stateListeners = new ConcurrentHashSet<>();
 
-    private final ConcurrentMap<String, ConcurrentMap<ChildListener, WatcherListener>> childListeners = new ConcurrentHashMap<>();
+    private final Map<String, Map<ChildListener, WatcherListener>> childListeners = CollectionUtils.newConcurrentHashMap();
     private final List<String> categories = Arrays.asList(PROVIDERS_CATEGORY, CONSUMERS_CATEGORY, ROUTERS_CATEGORY,
             CONFIGURATORS_CATEGORY);
     private volatile boolean closed = false;
@@ -106,14 +106,14 @@ public Set<StateListener> getSessionListeners() {
 
     @Override
     public List<String> addChildListener(String path, final ChildListener listener) {
-        ConcurrentMap<ChildListener, WatcherListener> listeners = childListeners.computeIfAbsent(path, k -> new ConcurrentHashMap<>());
+        Map<ChildListener, WatcherListener> listeners = childListeners.computeIfAbsent(path, k -> CollectionUtils.newConcurrentHashMap());
         WatcherListener targetListener = listeners.computeIfAbsent(listener, k -> createChildWatcherListener(path, k));
         return addChildWatcherListener(path, targetListener);
     }
 
     @Override
     public WatcherListener getChildListener(String path, ChildListener listener) {
-        ConcurrentMap<ChildListener, WatcherListener> listeners = childListeners.get(path);
+        Map<ChildListener, WatcherListener> listeners = childListeners.get(path);
         if (listeners == null) {
             return null;
         }
@@ -122,7 +122,7 @@ public WatcherListener getChildListener(String path, ChildListener listener) {
 
     @Override
     public void removeChildListener(String path, ChildListener listener) {
-        ConcurrentMap<ChildListener, WatcherListener> listeners = childListeners.get(path);
+        Map<ChildListener, WatcherListener> listeners = childListeners.get(path);
         if (listeners != null) {
             WatcherListener targetListener = listeners.remove(listener);
             if (targetListener != null) {

dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/utils/SubnetUtil.java

@@ -16,6 +16,7 @@
  */
 package org.apache.dubbo.tag.subnets.utils;
 
+import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 
 import org.apache.commons.net.util.SubnetUtils;
@@ -26,14 +27,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 
 public class SubnetUtil {
     public static final String TAG_SUBNETS_KEY = "tag.subnets";
 
-    private static final Map<String, List<SubnetUtils.SubnetInfo>> cellSubnets = new ConcurrentHashMap<>();
+    private static final Map<String, List<SubnetUtils.SubnetInfo>> cellSubnets = CollectionUtils.newConcurrentHashMap();
     private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
     private static final ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
     private static final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();