Merge pull request #2 from KFCFans/master

Update to 3.4.0-bugfix
This commit is contained in:
Jining Jiang 2020-12-14 09:53:59 +08:00 committed by GitHub
commit 3acbd0bcf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 15 deletions

View File

@ -10,12 +10,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-agent</artifactId>
<version>3.4.0</version>
<version>3.4.0-bugfix</version>
<packaging>jar</packaging>
<properties>
<powerjob.worker.version>3.4.0</powerjob.worker.version>
<powerjob.worker.version>3.4.0-bugfix</powerjob.worker.version>
<logback.version>1.2.3</logback.version>
<picocli.version>4.3.2</picocli.version>

View File

@ -14,7 +14,7 @@
<properties>
<springboot.version>2.2.6.RELEASE</springboot.version>
<powerjob.worker.starter.version>3.4.0</powerjob.worker.starter.version>
<powerjob.worker.starter.version>3.4.0-bugfix</powerjob.worker.starter.version>
<fastjson.version>1.2.68</fastjson.version>
<!-- 部署时跳过该module -->

View File

@ -10,11 +10,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-spring-boot-starter</artifactId>
<version>3.4.0</version>
<version>3.4.0-bugfix</version>
<packaging>jar</packaging>
<properties>
<powerjob.worker.version>3.4.0</powerjob.worker.version>
<powerjob.worker.version>3.4.0-bugfix</powerjob.worker.version>
<springboot.version>2.2.6.RELEASE</springboot.version>
</properties>

View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker</artifactId>
<version>3.4.0</version>
<version>3.4.0-bugfix</version>
<packaging>jar</packaging>
<properties>

View File

@ -25,22 +25,17 @@ public class ProcessorTrackerPool {
/**
* 获取 ProcessorTracker如果不存在则创建
*/
public static ProcessorTracker getProcessorTracker(Long instanceId, String address, Supplier<ProcessorTracker> creator) {
public static synchronized ProcessorTracker getProcessorTracker(Long instanceId, String address, Supplier<ProcessorTracker> creator) {
ProcessorTracker processorTracker = processorTrackerPool.getOrDefault(instanceId, Collections.emptyMap()).get(address);
if (processorTracker == null) {
synchronized (ProcessorTrackerPool.class) {
processorTracker = processorTrackerPool.getOrDefault(instanceId, Collections.emptyMap()).get(address);
if (processorTracker == null) {
processorTracker = creator.get();
processorTrackerPool.computeIfAbsent(instanceId, ignore -> Maps.newHashMap()).put(address, processorTracker);
}
}
processorTracker = creator.get();
processorTrackerPool.computeIfAbsent(instanceId, ignore -> Maps.newHashMap()).put(address, processorTracker);
}
return processorTracker;
}
public static List<ProcessorTracker> removeProcessorTracker(Long instanceId) {
public static synchronized List<ProcessorTracker> removeProcessorTracker(Long instanceId) {
List<ProcessorTracker> res = Lists.newLinkedList();
Map<String, ProcessorTracker> ttAddress2Pt = processorTrackerPool.remove(instanceId);