You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/11/05 04:04:20 UTC
[shardingsphere-elasticjob] branch master updated: Fix distribute
once listener may cause deadlock when all servers are disabled (#1692)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 8e16542 Fix distribute once listener may cause deadlock when all servers are disabled (#1692)
8e16542 is described below
commit 8e16542ea87db82b891f7ba7435c7cfdac8b9a3b
Author: 吴伟杰 <ro...@me.com>
AuthorDate: Thu Nov 5 12:04:06 2020 +0800
Fix distribute once listener may cause deadlock when all servers are disabled (#1692)
---
.../lite/api/listener/AbstractDistributeOnceElasticJobListener.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/listener/AbstractDistributeOnceElasticJobListener.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/listener/AbstractDistributeOnceElasticJobListener.java
index 7ef17f8..4e72e3b 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/listener/AbstractDistributeOnceElasticJobListener.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/listener/AbstractDistributeOnceElasticJobListener.java
@@ -53,6 +53,9 @@ public abstract class AbstractDistributeOnceElasticJobListener implements Elasti
@Override
public final void beforeJobExecuted(final ShardingContexts shardingContexts) {
Set<Integer> shardingItems = shardingContexts.getShardingItemParameters().keySet();
+ if (shardingItems.isEmpty()) {
+ return;
+ }
guaranteeService.registerStart(shardingItems);
while (!guaranteeService.isRegisterStartSuccess(shardingItems)) {
BlockUtils.waitingShortTime();
@@ -79,6 +82,9 @@ public abstract class AbstractDistributeOnceElasticJobListener implements Elasti
@Override
public final void afterJobExecuted(final ShardingContexts shardingContexts) {
Set<Integer> shardingItems = shardingContexts.getShardingItemParameters().keySet();
+ if (shardingItems.isEmpty()) {
+ return;
+ }
guaranteeService.registerComplete(shardingItems);
while (!guaranteeService.isRegisterCompleteSuccess(shardingItems)) {
BlockUtils.waitingShortTime();