crabapples
/
Sentinel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply volatile modifier for fields in FlowRuleManager while keep concurrency semantics intact (#2107) 

- Revert #1783
This commit is contained in:
Jerry Chin 2021-04-27 19:33:58 +08:00 committed by Eric Zhao
parent e936d9d379
commit 36b162cc70
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/flow/FlowRuleManager.java
View File

@ -16,14 +16,12 @@
package com.alibaba.csp.sentinel.slots.block.flow;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import com.alibaba.csp.sentinel.concurrent.NamedThreadFactory;
import com.alibaba.csp.sentinel.config.SentinelConfig;
@ -50,7 +48,7 @@ import com.alibaba.csp.sentinel.property.SentinelProperty;
*/
public class FlowRuleManager {
private static final AtomicReference<Map<String, List<FlowRule>>> flowRules = new AtomicReference<Map<String, List<FlowRule>>>();
private static volatile Map<String, List<FlowRule>> flowRules = new HashMap<>();
private static final FlowPropertyListener LISTENER = new FlowPropertyListener();
private static SentinelProperty<List<FlowRule>> currentProperty = new DynamicSentinelProperty<List<FlowRule>>();
@ -60,11 +58,10 @@ public class FlowRuleManager {
new NamedThreadFactory("sentinel-metrics-record-task", true));
static {
flowRules.set(Collections.<String, List<FlowRule>>emptyMap());
currentProperty.addListener(LISTENER);
startMetricTimerListener();
}
/**
* <p> Start the MetricTimerListener
* <ol>
@ -79,12 +76,12 @@ public class FlowRuleManager {
if (flushInterval <= 0) {
RecordLog.info("[FlowRuleManager] The MetricTimerListener isn't started. If you want to start it, "
+ "please change the value(current: {}) of config({}) more than 0 to start it.", flushInterval,
SentinelConfig.METRIC_FLUSH_INTERVAL);
SentinelConfig.METRIC_FLUSH_INTERVAL);
return;
}
SCHEDULER.scheduleAtFixedRate(new MetricTimerListener(), 0, flushInterval, TimeUnit.SECONDS);
}
/**
* Listen to the {@link SentinelProperty} for {@link FlowRule}s. The property is the source of {@link FlowRule}s.
* Flow rules can also be set by {@link #loadRules(List)} directly.
@ -108,7 +105,7 @@ public class FlowRuleManager {
*/
public static List<FlowRule> getRules() {
List<FlowRule> rules = new ArrayList<FlowRule>();
for (Map.Entry<String, List<FlowRule>> entry : flowRules.get().entrySet()) {
for (Map.Entry<String, List<FlowRule>> entry : flowRules.entrySet()) {
rules.addAll(entry.getValue());
}
return rules;
@ -124,11 +121,11 @@ public class FlowRuleManager {
}
static Map<String, List<FlowRule>> getFlowRuleMap() {
return flowRules.get();
return flowRules;
}
public static boolean hasConfig(String resource) {
return flowRules.get().containsKey(resource);
return flowRules.containsKey(resource);
}
public static boolean isOtherOrigin(String origin, String resourceName) {
@ -136,7 +133,7 @@ public class FlowRuleManager {
return false;
}
List<FlowRule> rules = flowRules.get().get(resourceName);
List<FlowRule> rules = flowRules.get(resourceName);
if (rules != null) {
for (FlowRule rule : rules) {
@ -152,18 +149,20 @@ public class FlowRuleManager {
private static final class FlowPropertyListener implements PropertyListener<List<FlowRule>> {
@Override
public void configUpdate(List<FlowRule> value) {
public synchronized void configUpdate(List<FlowRule> value) {
Map<String, List<FlowRule>> rules = FlowRuleUtil.buildFlowRuleMap(value);
//the rules was always not null, it's no need to check nullable
//remove checking to avoid IDE warning
flowRules.set(rules);
if (rules != null) {
flowRules = rules;
}
RecordLog.info("[FlowRuleManager] Flow rules received: {}", rules);
}
@Override
public void configLoad(List<FlowRule> conf) {
public synchronized void configLoad(List<FlowRule> conf) {
Map<String, List<FlowRule>> rules = FlowRuleUtil.buildFlowRuleMap(conf);
flowRules.set(rules);
if (rules != null) {
flowRules = rules;
}
RecordLog.info("[FlowRuleManager] Flow rules loaded: {}", rules);
}
}