You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/11 07:03:07 UTC
[incubator-servicecomb-java-chassis] 01/02: SCB-217 avoid
concurrentHashMap concurrence problem of computeIfAbsent
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 7b836c7f9ed0a81800744f1fdaa2cca6a4c6ff4f
Author: wujimin <wu...@huawei.com>
AuthorDate: Thu Jan 11 10:44:38 2018 +0800
SCB-217 avoid concurrentHashMap concurrence problem of computeIfAbsent
---
.../core/executor/FixedThreadExecutor.java | 5 +-
.../handler/impl/SimpleLoadBalanceHandler.java | 4 +-
.../edge/core/CompatiblePathVersionMapper.java | 4 +-
.../core/OperationInstancesDiscoveryFilter.java | 4 +-
.../common/concurrent/ConcurrentHashMapEx.java | 58 ++++++++++++++++++++++
.../output/servo/RollingMetricsFileOutput.java | 4 +-
.../metrics/performance/MetricsDataMonitor.java | 12 ++---
.../foundation/vertx/client/ClientPoolManager.java | 4 +-
.../tcp/AbstractTcpClientConnectionPool.java | 4 +-
.../loadbalance/LoadbalanceHandler.java | 4 +-
.../metrics/core/monitor/RegistryMonitor.java | 6 +--
.../samples/mwf/Log4JMetricsFileWriter.java | 8 +--
.../samples/mwf/Log4J2MetricsFileWriter.java | 34 ++++++++++---
.../serviceregistry/consumer/AppManager.java | 5 +-
.../consumer/MicroserviceManager.java | 4 +-
.../consumer/MicroserviceVersions.java | 6 +--
.../discovery/DiscoveryTreeNode.java | 6 +--
.../serviceregistry/version/VersionRuleUtils.java | 5 +-
.../serviceregistry/version/VersionUtils.java | 5 +-
.../starter/discovery/CseDiscoveryClient.java | 4 +-
20 files changed, 135 insertions(+), 51 deletions(-)
diff --git a/core/src/main/java/io/servicecomb/core/executor/FixedThreadExecutor.java b/core/src/main/java/io/servicecomb/core/executor/FixedThreadExecutor.java
index 0969d49..1657569 100644
--- a/core/src/main/java/io/servicecomb/core/executor/FixedThreadExecutor.java
+++ b/core/src/main/java/io/servicecomb/core/executor/FixedThreadExecutor.java
@@ -20,7 +20,6 @@ package io.servicecomb.core.executor;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
@@ -30,6 +29,8 @@ import org.slf4j.LoggerFactory;
import com.netflix.config.DynamicPropertyFactory;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+
public class FixedThreadExecutor implements Executor {
private static final Logger LOGGER = LoggerFactory.getLogger(FixedThreadExecutor.class);
@@ -44,7 +45,7 @@ public class FixedThreadExecutor implements Executor {
// it's impossible that has too many network thread, so index will not too big that less than 0
private AtomicInteger index = new AtomicInteger();
- private Map<Long, Executor> threadExecutorMap = new ConcurrentHashMap<>();
+ private Map<Long, Executor> threadExecutorMap = new ConcurrentHashMapEx<>();
public FixedThreadExecutor() {
int groupCount = DynamicPropertyFactory.getInstance().getIntProperty(KEY_GROUP, 2).get();
diff --git a/core/src/main/java/io/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java b/core/src/main/java/io/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java
index b62a577..aa8f1d2 100644
--- a/core/src/main/java/io/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java
+++ b/core/src/main/java/io/servicecomb/core/handler/impl/SimpleLoadBalanceHandler.java
@@ -19,7 +19,6 @@ package io.servicecomb.core.handler.impl;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
@@ -31,6 +30,7 @@ import io.servicecomb.core.Invocation;
import io.servicecomb.core.exception.ExceptionUtils;
import io.servicecomb.core.filter.EndpointDiscoveryFilter;
import io.servicecomb.foundation.common.cache.VersionedCache;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.serviceregistry.discovery.DiscoveryContext;
import io.servicecomb.serviceregistry.discovery.DiscoveryFilter;
import io.servicecomb.serviceregistry.discovery.DiscoveryTree;
@@ -45,7 +45,7 @@ public class SimpleLoadBalanceHandler implements Handler {
private DiscoveryTree discoveryTree = new DiscoveryTree();
// key为grouping filter qualified name
- private volatile Map<String, AtomicInteger> indexMap = new ConcurrentHashMap<>();
+ private volatile Map<String, AtomicInteger> indexMap = new ConcurrentHashMapEx<>();
public SimpleLoadBalanceHandler() {
discoveryTree.loadFromSPI(DiscoveryFilter.class);
diff --git a/edge/edge-core/src/main/java/io/servicecomb/edge/core/CompatiblePathVersionMapper.java b/edge/edge-core/src/main/java/io/servicecomb/edge/core/CompatiblePathVersionMapper.java
index c5297cf..7e33b80 100644
--- a/edge/edge-core/src/main/java/io/servicecomb/edge/core/CompatiblePathVersionMapper.java
+++ b/edge/edge-core/src/main/java/io/servicecomb/edge/core/CompatiblePathVersionMapper.java
@@ -18,10 +18,10 @@
package io.servicecomb.edge.core;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.springframework.util.StringUtils;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.foundation.common.exceptions.ServiceCombException;
import io.servicecomb.serviceregistry.version.VersionRule;
import io.servicecomb.serviceregistry.version.VersionRuleUtils;
@@ -29,7 +29,7 @@ import io.servicecomb.serviceregistry.version.VersionRuleUtils;
public class CompatiblePathVersionMapper {
// v1 -> 1.0.0-2.0.0
// v2 -> 2.0.0-3.0.0
- private Map<String, VersionRule> mapper = new ConcurrentHashMap<>();
+ private Map<String, VersionRule> mapper = new ConcurrentHashMapEx<>();
public VersionRule getOrCreate(String pathVersion) {
return mapper.computeIfAbsent(pathVersion, pv -> {
diff --git a/edge/edge-core/src/main/java/io/servicecomb/edge/core/OperationInstancesDiscoveryFilter.java b/edge/edge-core/src/main/java/io/servicecomb/edge/core/OperationInstancesDiscoveryFilter.java
index 3cdbd2d..2067f5f 100644
--- a/edge/edge-core/src/main/java/io/servicecomb/edge/core/OperationInstancesDiscoveryFilter.java
+++ b/edge/edge-core/src/main/java/io/servicecomb/edge/core/OperationInstancesDiscoveryFilter.java
@@ -22,12 +22,12 @@ import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
import io.servicecomb.core.Invocation;
import io.servicecomb.core.definition.MicroserviceMeta;
import io.servicecomb.core.definition.MicroserviceVersionMeta;
import io.servicecomb.core.definition.OperationMeta;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.serviceregistry.RegistryUtils;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.consumer.AppManager;
@@ -83,7 +83,7 @@ public class OperationInstancesDiscoveryFilter extends AbstractDiscoveryFilter {
protected Map<String, DiscoveryTreeNode> initOperationNodes(DiscoveryTreeNode parent,
Map<MicroserviceVersionMeta, Map<String, MicroserviceInstance>> versionMap) {
- Map<String, DiscoveryTreeNode> tmpChildren = new ConcurrentHashMap<>();
+ Map<String, DiscoveryTreeNode> tmpChildren = new ConcurrentHashMapEx<>();
versionMap
.keySet()
.stream()
diff --git a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/concurrent/ConcurrentHashMapEx.java b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/concurrent/ConcurrentHashMapEx.java
new file mode 100644
index 0000000..30670dd
--- /dev/null
+++ b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/concurrent/ConcurrentHashMapEx.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.servicecomb.foundation.common.concurrent;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+public class ConcurrentHashMapEx<K, V> extends ConcurrentHashMap<K, V> {
+ private static final long serialVersionUID = -7753722464102569902L;
+
+ public ConcurrentHashMapEx() {
+ super();
+ }
+
+ public ConcurrentHashMapEx(int initialCapacity) {
+ super(initialCapacity);
+ }
+
+ public ConcurrentHashMapEx(Map<? extends K, ? extends V> m) {
+ super(m);
+ }
+
+ public ConcurrentHashMapEx(int initialCapacity, float loadFactor) {
+ super(initialCapacity, loadFactor);
+ }
+
+ public ConcurrentHashMapEx(int initialCapacity,
+ float loadFactor, int concurrencyLevel) {
+ super(initialCapacity, loadFactor, concurrencyLevel);
+ }
+
+ // ConcurrentHashMap.computeIfAbsent always do "synchronized" operation
+ // so we wrap it to improve performance
+ @Override
+ public V computeIfAbsent(K key, Function<? super K, ? extends V> mappingFunction) {
+ V value = get(key);
+ if (value != null) {
+ return value;
+ }
+
+ return super.computeIfAbsent(key, mappingFunction);
+ }
+}
diff --git a/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/output/servo/RollingMetricsFileOutput.java b/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/output/servo/RollingMetricsFileOutput.java
index affec87..84c3a41 100644
--- a/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/output/servo/RollingMetricsFileOutput.java
+++ b/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/output/servo/RollingMetricsFileOutput.java
@@ -18,18 +18,18 @@
package io.servicecomb.foundation.metrics.output.servo;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.foundation.metrics.output.MetricsFileOutput;
@Component
public class RollingMetricsFileOutput extends MetricsFileOutput {
- private final Map<String, Logger> allLoggers = new ConcurrentHashMap<>();
+ private final Map<String, Logger> allLoggers = new ConcurrentHashMapEx<>();
public RollingMetricsFileOutput() {
}
diff --git a/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/performance/MetricsDataMonitor.java b/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/performance/MetricsDataMonitor.java
index b8f0db9..1c7d604 100644
--- a/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/performance/MetricsDataMonitor.java
+++ b/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/performance/MetricsDataMonitor.java
@@ -18,7 +18,8 @@
package io.servicecomb.foundation.metrics.performance;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
/**
* Implements the collection of metrics such as total request, total fail
@@ -46,15 +47,15 @@ public class MetricsDataMonitor {
// key is operQualifiedName
// inc
// after invocation finished
- public Map<String, Long> operMetricsTotalReq = new ConcurrentHashMap<>();
+ public Map<String, Long> operMetricsTotalReq = new ConcurrentHashMapEx<>();
// key is operQualifiedName
// inc
// after invocation finished
- public Map<String, Long> operMetricsTotalFailReq = new ConcurrentHashMap<>();
+ public Map<String, Long> operMetricsTotalFailReq = new ConcurrentHashMapEx<>();
// key is operQualifiedName
- public Map<String, QueueMetricsData> queueMetrics = new ConcurrentHashMap<>();
+ public Map<String, QueueMetricsData> queueMetrics = new ConcurrentHashMapEx<>();
/**
* default constructor.
@@ -70,8 +71,7 @@ public class MetricsDataMonitor {
* @return QueueMetrics object based on key
*/
public QueueMetricsData getOrCreateQueueMetrics(String pathId) {
- return queueMetrics.computeIfAbsent(pathId, p -> new QueueMetricsData()
- );
+ return queueMetrics.computeIfAbsent(pathId, p -> new QueueMetricsData());
}
/**
diff --git a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/ClientPoolManager.java b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/ClientPoolManager.java
index 004b13a..5084ede 100644
--- a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/ClientPoolManager.java
+++ b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/ClientPoolManager.java
@@ -20,10 +20,10 @@ package io.servicecomb.foundation.vertx.client;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.vertx.core.Context;
import io.vertx.core.Vertx;
@@ -54,7 +54,7 @@ public class ClientPoolManager<CLIENT_POOL> {
// send的调用线程与CLIENT_POOL的绑定关系,不直接用hash,是担心分配不均
// key是调用者的线程id
// TODO:要不要考虑已经绑定的线程消失了的场景?
- private Map<Long, CLIENT_POOL> threadBindMap = new ConcurrentHashMap<>();
+ private Map<Long, CLIENT_POOL> threadBindMap = new ConcurrentHashMapEx<>();
public ClientPoolManager(Vertx vertx, ClientPoolFactory<CLIENT_POOL> factory) {
this.vertx = vertx;
diff --git a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientConnectionPool.java b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientConnectionPool.java
index dd888c0..a08b1f4 100644
--- a/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientConnectionPool.java
+++ b/foundations/foundation-vertx/src/main/java/io/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientConnectionPool.java
@@ -18,9 +18,9 @@
package io.servicecomb.foundation.vertx.client.tcp;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.vertx.core.Context;
public abstract class AbstractTcpClientConnectionPool<T extends TcpClientConnection> {
@@ -30,7 +30,7 @@ public abstract class AbstractTcpClientConnectionPool<T extends TcpClientConnect
protected NetClientWrapper netClientWrapper;
// key为address
- protected Map<String, T> tcpClientMap = new ConcurrentHashMap<>();
+ protected Map<String, T> tcpClientMap = new ConcurrentHashMapEx<>();
public AbstractTcpClientConnectionPool(Context context,
NetClientWrapper netClientWrapper) {
diff --git a/handlers/handler-loadbalance/src/main/java/io/servicecomb/loadbalance/LoadbalanceHandler.java b/handlers/handler-loadbalance/src/main/java/io/servicecomb/loadbalance/LoadbalanceHandler.java
index 61fd9ae..df727c2 100644
--- a/handlers/handler-loadbalance/src/main/java/io/servicecomb/loadbalance/LoadbalanceHandler.java
+++ b/handlers/handler-loadbalance/src/main/java/io/servicecomb/loadbalance/LoadbalanceHandler.java
@@ -20,7 +20,6 @@ package io.servicecomb.loadbalance;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -44,6 +43,7 @@ import io.servicecomb.core.Invocation;
import io.servicecomb.core.exception.ExceptionUtils;
import io.servicecomb.core.provider.consumer.SyncResponseExecutor;
import io.servicecomb.foundation.common.cache.VersionedCache;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.loadbalance.filter.CseServerDiscoveryFilter;
import io.servicecomb.loadbalance.filter.IsolationServerListFilter;
import io.servicecomb.loadbalance.filter.TransactionControlFilter;
@@ -73,7 +73,7 @@ public class LoadbalanceHandler implements Handler {
private DiscoveryTree discoveryTree = new DiscoveryTree();
// key为grouping filter qualified name
- private volatile Map<String, LoadBalancer> loadBalancerMap = new ConcurrentHashMap<>();
+ private volatile Map<String, LoadBalancer> loadBalancerMap = new ConcurrentHashMapEx<>();
private final Object lock = new Object();
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java
index 387c050..7c810b2 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java
@@ -19,11 +19,11 @@ package io.servicecomb.metrics.core.monitor;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.metrics.common.ConsumerInvocationMetric;
import io.servicecomb.metrics.common.ProducerInvocationMetric;
import io.servicecomb.metrics.common.RegistryMetric;
@@ -40,8 +40,8 @@ public class RegistryMonitor {
@Autowired
public RegistryMonitor(SystemMonitor systemMonitor) {
this.systemMonitor = systemMonitor;
- this.consumerInvocationMonitors = new ConcurrentHashMap<>();
- this.producerInvocationMonitors = new ConcurrentHashMap<>();
+ this.consumerInvocationMonitors = new ConcurrentHashMapEx<>();
+ this.producerInvocationMonitors = new ConcurrentHashMapEx<>();
}
public ConsumerInvocationMonitor getConsumerInvocationMonitor(String operationName) {
diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java
index 716fba1..ba166cc 100644
--- a/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java
+++ b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java
@@ -19,7 +19,6 @@ package io.servicecomb.samples.mwf;
import java.nio.file.Paths;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -30,6 +29,8 @@ import org.springframework.stereotype.Component;
import com.netflix.config.DynamicPropertyFactory;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+
@Component
public class Log4JMetricsFileWriter implements MetricsFileWriter {
private static final String METRICS_FILE_ROLLING_MAX_FILE_COUNT = "servicecomb.metrics.file.rolling.max_file_count";
@@ -39,7 +40,7 @@ public class Log4JMetricsFileWriter implements MetricsFileWriter {
private static final String METRICS_FILE_ROOT_PATH = "servicecomb.metrics.file.root_path";
- private final Map<String, RollingFileAppender> fileAppenders = new ConcurrentHashMap<>();
+ private final Map<String, RollingFileAppender> fileAppenders = new ConcurrentHashMapEx<>();
private final int maxFileCount;
@@ -49,7 +50,8 @@ public class Log4JMetricsFileWriter implements MetricsFileWriter {
public Log4JMetricsFileWriter() {
maxFileCount = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_FILE_ROLLING_MAX_FILE_COUNT, 10).get();
- maxFileSize = DynamicPropertyFactory.getInstance().getStringProperty(METRICS_FILE_ROLLING_MAX_FILE_SIZE, "10MB")
+ maxFileSize = DynamicPropertyFactory.getInstance()
+ .getStringProperty(METRICS_FILE_ROLLING_MAX_FILE_SIZE, "10MB")
.get();
rootPath = DynamicPropertyFactory.getInstance().getStringProperty(METRICS_FILE_ROOT_PATH, "target").get();
}
diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java
index 13a5046..c49ac72 100644
--- a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java
+++ b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java
@@ -19,7 +19,6 @@ package io.servicecomb.samples.mwf;
import java.nio.file.Paths;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
@@ -34,6 +33,8 @@ import org.springframework.stereotype.Component;
import com.netflix.config.DynamicPropertyFactory;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+
@Component
public class Log4J2MetricsFileWriter implements MetricsFileWriter {
private static final String METRICS_FILE_ROLLING_MAX_FILE_COUNT = "servicecomb.metrics.file.rolling.max_file_count";
@@ -46,7 +47,7 @@ public class Log4J2MetricsFileWriter implements MetricsFileWriter {
private final Configuration config = ctx.getConfiguration();
- private final Map<String, RollingFileAppender> fileAppenders = new ConcurrentHashMap<>();
+ private final Map<String, RollingFileAppender> fileAppenders = new ConcurrentHashMapEx<>();
private final int maxFileCount;
@@ -56,7 +57,8 @@ public class Log4J2MetricsFileWriter implements MetricsFileWriter {
public Log4J2MetricsFileWriter() {
maxFileCount = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_FILE_ROLLING_MAX_FILE_COUNT, 10).get();
- maxFileSize = DynamicPropertyFactory.getInstance().getStringProperty(METRICS_FILE_ROLLING_MAX_FILE_SIZE, "10MB")
+ maxFileSize = DynamicPropertyFactory.getInstance()
+ .getStringProperty(METRICS_FILE_ROLLING_MAX_FILE_SIZE, "10MB")
.get();
rootPath = DynamicPropertyFactory.getInstance().getStringProperty(METRICS_FILE_ROOT_PATH, "target").get();
}
@@ -73,12 +75,30 @@ public class Log4J2MetricsFileWriter implements MetricsFileWriter {
PatternLayout layout = PatternLayout.newBuilder().withPattern(PatternLayout.DEFAULT_CONVERSION_PATTERN).build();
SizeBasedTriggeringPolicy policy = SizeBasedTriggeringPolicy.createPolicy(maxFileSize);
- DefaultRolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(String.valueOf(maxFileCount), null, null,
- null, null, false, config);
+ DefaultRolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(String.valueOf(maxFileCount),
+ null,
+ null,
+ null,
+ null,
+ false,
+ config);
//TODO:use RollingFileAppender.newBuilder throw No such static method exception,will improve later!
return RollingFileAppender
- .createAppender(fileName, filePattern, "true", loggerName, "true", null,
- "true", policy, strategy, layout, null, null, null, null, config);
+ .createAppender(fileName,
+ filePattern,
+ "true",
+ loggerName,
+ "true",
+ null,
+ "true",
+ policy,
+ strategy,
+ layout,
+ null,
+ null,
+ null,
+ null,
+ config);
}
}
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/AppManager.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/AppManager.java
index 3b34b59..0128fee 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/AppManager.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/AppManager.java
@@ -18,17 +18,18 @@
package io.servicecomb.serviceregistry.consumer;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import com.google.common.eventbus.EventBus;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+
public class AppManager {
private EventBus eventBus;
private MicroserviceVersionFactory microserviceVersionFactory = new DefaultMicroserviceVersionFactory();
// key: appId
- private Map<String, MicroserviceManager> apps = new ConcurrentHashMap<>();
+ private Map<String, MicroserviceManager> apps = new ConcurrentHashMapEx<>();
public AppManager(EventBus eventBus) {
this.eventBus = eventBus;
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceManager.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceManager.java
index aca5ef2..763e0fc 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceManager.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceManager.java
@@ -18,10 +18,10 @@
package io.servicecomb.serviceregistry.consumer;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import com.google.common.eventbus.Subscribe;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.serviceregistry.task.event.PeriodicPullEvent;
import io.servicecomb.serviceregistry.task.event.RecoveryEvent;
@@ -31,7 +31,7 @@ public class MicroserviceManager {
private String appId;
// key: microserviceName
- private Map<String, MicroserviceVersions> versionsByName = new ConcurrentHashMap<>();
+ private Map<String, MicroserviceVersions> versionsByName = new ConcurrentHashMapEx<>();
public MicroserviceManager(AppManager appManager, String appId) {
this.appManager = appManager;
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java
index 796d1c5..6e398c0 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/consumer/MicroserviceVersions.java
@@ -19,7 +19,6 @@ package io.servicecomb.serviceregistry.consumer;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -29,6 +28,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.eventbus.Subscribe;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.serviceregistry.RegistryUtils;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import io.servicecomb.serviceregistry.api.registry.MicroserviceInstanceStatus;
@@ -51,10 +51,10 @@ public class MicroserviceVersions {
private List<MicroserviceInstance> instances;
// key is service id
- private Map<String, MicroserviceVersion> versions = new ConcurrentHashMap<>();
+ private Map<String, MicroserviceVersion> versions = new ConcurrentHashMapEx<>();
// key is version rule
- private Map<String, MicroserviceVersionRule> versionRules = new ConcurrentHashMap<>();
+ private Map<String, MicroserviceVersionRule> versionRules = new ConcurrentHashMapEx<>();
// process pulled instances and create versionRule must be protected by lock
// otherwise maybe lost instance or version in versionRule
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/discovery/DiscoveryTreeNode.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/discovery/DiscoveryTreeNode.java
index cf72522..e9d251e 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/discovery/DiscoveryTreeNode.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/discovery/DiscoveryTreeNode.java
@@ -18,18 +18,18 @@
package io.servicecomb.serviceregistry.discovery;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import io.servicecomb.foundation.common.cache.VersionedCache;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
public class DiscoveryTreeNode extends VersionedCache {
private boolean childrenInited;
private int level;
- protected Map<String, Object> attributes = new ConcurrentHashMap<>();
+ protected Map<String, Object> attributes = new ConcurrentHashMapEx<>();
- protected Map<String, DiscoveryTreeNode> children = new ConcurrentHashMap<>();
+ protected Map<String, DiscoveryTreeNode> children = new ConcurrentHashMapEx<>();
public boolean childrenInited() {
return childrenInited;
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionRuleUtils.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionRuleUtils.java
index 8da6f71..c959c8c 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionRuleUtils.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionRuleUtils.java
@@ -21,12 +21,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
+
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
public final class VersionRuleUtils {
private static List<VersionRuleParser> parsers = new ArrayList<>();
- private static Map<String, VersionRule> versionRuleCache = new ConcurrentHashMap<>();
+ private static Map<String, VersionRule> versionRuleCache = new ConcurrentHashMapEx<>();
static {
parsers.add(new VersionRuleLatestParser());
diff --git a/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionUtils.java b/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionUtils.java
index 04a2272..ed6620c 100644
--- a/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionUtils.java
+++ b/service-registry/src/main/java/io/servicecomb/serviceregistry/version/VersionUtils.java
@@ -19,10 +19,11 @@ package io.servicecomb.serviceregistry.version;
import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
+
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
public final class VersionUtils {
- private static Map<String, Version> versionCache = new ConcurrentHashMap<>();
+ private static Map<String, Version> versionCache = new ConcurrentHashMapEx<>();
public static Version getOrCreate(String strVersion) {
Objects.requireNonNull(strVersion);
diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java
index 28b68f3..c07289b 100644
--- a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java
+++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java
@@ -19,13 +19,13 @@ package io.servicecomb.springboot.starter.discovery;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import io.servicecomb.foundation.common.cache.VersionedCache;
+import io.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
import io.servicecomb.foundation.common.net.URIEndpointObject;
import io.servicecomb.serviceregistry.RegistryUtils;
import io.servicecomb.serviceregistry.api.registry.Microservice;
@@ -36,7 +36,7 @@ import io.servicecomb.serviceregistry.discovery.DiscoveryContext;
import io.servicecomb.serviceregistry.discovery.DiscoveryTree;
public class CseDiscoveryClient implements DiscoveryClient {
- private Map<String, DiscoveryTree> discoveryTrees = new ConcurrentHashMap<>();
+ private Map<String, DiscoveryTree> discoveryTrees = new ConcurrentHashMapEx<>();
@Override
public String description() {
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.