Unverified Commit 54fc32e2 authored by qiaozhanwei's avatar qiaozhanwei Committed by GitHub
Browse files

#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: default avatarqiaozhanwei <qiaozhanwei@analysys.com.cn>
parent 28766df5

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java

+2 −1
Original line number Diff line number Diff line
@@ -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);