You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by te...@apache.org on 2020/01/07 09:35:45 UTC

[incubator-dolphinscheduler] branch dev updated: why not invoke checkWorkerGroup in advance (#1747)

This is an automated email from the ASF dual-hosted git repository.

technoboy 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 0a39f1a  why not invoke checkWorkerGroup in advance  (#1747)
0a39f1a is described below

commit 0a39f1a4dd1910c9f86fac055add4c1a15ece1b8
Author: gabry.wu <wu...@qq.com>
AuthorDate: Tue Jan 7 17:35:38 2020 +0800

    why not invoke checkWorkerGroup in advance  (#1747)
    
    * issue https://github.com/apache/incubator-dolphinscheduler/issues/1743
    
    * issue https://github.com/apache/incubator-dolphinscheduler/issues/1743
---
 .../dolphinscheduler/server/worker/runner/FetchTaskThread.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java
index 60cfd82..536fd0b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java
@@ -186,6 +186,10 @@ public class FetchTaskThread implements Runnable{
                         continue;
                     }
 
+                    if(!checkWorkerGroup(taskInstance, OSUtils.getHost())){
+                        continue;
+                    }
+
                     Tenant tenant = processDao.getTenantForProcess(taskInstance.getProcessInstance().getTenantId(),
                             taskInstance.getProcessDefine().getUserId());
 
@@ -203,11 +207,6 @@ public class FetchTaskThread implements Runnable{
 
                     logger.info("worker fetch taskId : {} from queue ", taskInstId);
 
-
-                    if(!checkWorkerGroup(taskInstance, OSUtils.getHost())){
-                        continue;
-                    }
-
                     // local execute path
                     String execLocalPath = getExecLocalPath();