This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 54fc32e #2486 bug fix (#2487)
54fc32e is described below
commit 54fc32e20714b1e6269d5cfb0279d9315a813c4f
Author: qiaozhanwei <[email protected]>
AuthorDate: Tue Apr 21 18:52:07 2020 +0800
#2486 bug fix (#2487)
* dispatch task fail will set task status failed
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix
* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix
* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix
* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix
* send mail error, #2466 bug fix
* send mail error, #2466 bug fix
* send mail error, #2466 bug fix
* send mail error, #2466 bug fix
* #2486 bug fix
Co-authored-by: qiaozhanwei <[email protected]>
---
.../dolphinscheduler/server/worker/processor/TaskCallbackService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java
index ecae9ed..1e8bf9d 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java
@@ -96,8 +96,9 @@ public class TaskCallbackService {
return getRemoteChannel(newChannel,
nettyRemoteChannel.getOpaque(), taskInstanceId);
}
logger.warn("original master : {} is not reachable, random select
master", nettyRemoteChannel.getHost());
- Set<String> masterNodes =
zookeeperRegistryCenter.getMasterNodesDirectly();
+ Set<String> masterNodes = null;
while (Stopper.isRunning()) {
+ masterNodes = zookeeperRegistryCenter.getMasterNodesDirectly();
if (CollectionUtils.isEmpty(masterNodes)) {
logger.error("no available master node");
ThreadUtils.sleep(SLEEP_TIME_MILLIS);
