|
@@ -146,7 +146,7 @@ class ClusterUniqueTask implements Task ,Serializable{
|
|
|
|
|
|
|
|
private Mono<Void> init(){
|
|
private Mono<Void> init(){
|
|
|
return generatePingMsg()
|
|
return generatePingMsg()
|
|
|
- .concatWith(this.handlePingMsg())
|
|
|
|
|
|
|
+ .mergeWith(this.handlePingMsg())
|
|
|
.then();
|
|
.then();
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -172,8 +172,6 @@ class ClusterUniqueTask implements Task ,Serializable{
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
return false;
|
|
return false;
|
|
|
- }else if(lock.isLocked()&&lock.isHeldByThread(new Thread().getId())){
|
|
|
|
|
- return false;
|
|
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
})
|
|
})
|
|
@@ -188,7 +186,7 @@ class ClusterUniqueTask implements Task ,Serializable{
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- if(isReplica()){
|
|
|
|
|
|
|
+ if(!isReplica()){
|
|
|
if(State.running.equals(taskState)&&!State.running.equals(executor.getState())){
|
|
if(State.running.equals(taskState)&&!State.running.equals(executor.getState())){
|
|
|
executor.start();
|
|
executor.start();
|
|
|
}
|
|
}
|