fix AbstractTask's handle method exception (#1490)

* fix AbstractTask's handle method exception * update ut
apache · Dec 17, 2019 · 15d5d66 · 15d5d66
1 parent 4d8d74a
commit 15d5d66
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 26 deletions.
diff --git a/...server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractYarnTask.java b/...server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractYarnTask.java
@@ -68,6 +68,7 @@ public void handle() throws Exception {
     } catch (Exception e) {
       logger.error("yarn process failure", e);
       exitStatusCode = -1;
+      throw e;
     }
   }
 

diff --git a/...src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java b/...src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java
@@ -99,7 +99,7 @@ public void init(){
     }
 
     @Override
-    public void handle(){
+    public void handle() throws Exception {
         // set the name of the current thread
         String threadLoggerInfoName = String.format(Constants.TASK_LOG_INFO_FORMAT, taskProps.getTaskAppId());
         Thread.currentThread().setName(threadLoggerInfoName);
@@ -135,6 +135,7 @@ public void handle(){
         }catch (Exception e){
             logger.error(e.getMessage(),e);
             exitStatusCode = -1;
+            throw e;
         }
     }
 

diff --git a/...er-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java b/...er-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java
@@ -113,23 +113,20 @@ public void handle() throws Exception {
         long startTime = System.currentTimeMillis();
         String statusCode = null;
         String body = null;
-        try(CloseableHttpClient client = createHttpClient()) {
-            try(CloseableHttpResponse response = sendRequest(client)) {
-                statusCode = String.valueOf(getStatusCode(response));
-                body = getResponseBody(response);
-                exitStatusCode = validResponse(body, statusCode);
-                long costTime = System.currentTimeMillis() - startTime;
-                logger.info("startTime: {}, httpUrl: {}, httpMethod: {}, costTime : {}Millisecond, statusCode : {}, body : {}, log : {}",
-                        DateUtils.format2Readable(startTime), httpParameters.getUrl(),httpParameters.getHttpMethod(), costTime, statusCode, body, output);
-            }catch (Exception e) {
-                appendMessage(e.toString());
-                exitStatusCode = -1;
-                logger.error("httpUrl[" + httpParameters.getUrl() + "] connection failed："+output, e);
-            }
-        } catch (Exception e) {
+
+        try(CloseableHttpClient client = createHttpClient();
+            CloseableHttpResponse response = sendRequest(client)) {
+            statusCode = String.valueOf(getStatusCode(response));
+            body = getResponseBody(response);
+            exitStatusCode = validResponse(body, statusCode);
+            long costTime = System.currentTimeMillis() - startTime;
+            logger.info("startTime: {}, httpUrl: {}, httpMethod: {}, costTime : {}Millisecond, statusCode : {}, body : {}, log : {}",
+                    DateUtils.format2Readable(startTime), httpParameters.getUrl(),httpParameters.getHttpMethod(), costTime, statusCode, body, output);
+        }catch (Exception e){
             appendMessage(e.toString());
             exitStatusCode = -1;
             logger.error("httpUrl[" + httpParameters.getUrl() + "] connection failed："+output, e);
+            throw e;
         }
     }
 

diff --git a/...c/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java b/...c/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java
@@ -97,26 +97,20 @@ public void handle() throws Exception {
                 procedureParameters.getMethod(),
                 procedureParameters.getLocalParams());
 
-        // determine whether there is a data source
-        if (procedureParameters.getDatasource() == 0){
-            logger.error("datasource id not exists");
+        DataSource dataSource = processDao.findDataSourceById(procedureParameters.getDatasource());
+        if (dataSource == null){
+            logger.error("datasource not exists");
             exitStatusCode = -1;
-            return;
+            throw new IllegalArgumentException("datasource not found");
         }
 
-        DataSource dataSource = processDao.findDataSourceById(procedureParameters.getDatasource());
         logger.info("datasource name : {} , type : {} , desc : {} ,  user_id : {} , parameter : {}",
                 dataSource.getName(),
                 dataSource.getType(),
                 dataSource.getNote(),
                 dataSource.getUserId(),
                 dataSource.getConnectionParams());
 
-        if (dataSource == null){
-            logger.error("datasource not exists");
-            exitStatusCode = -1;
-            return;
-        }
         Connection connection = null;
         CallableStatement stmt = null;
         try {

diff --git a/...erver/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java b/...erver/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java
@@ -98,6 +98,7 @@ public void handle() throws Exception {
     } catch (Exception e) {
       logger.error("python task failure", e);
       exitStatusCode = -1;
+      throw e;
     }
   }
 

diff --git a/...-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java b/...-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java
@@ -106,6 +106,7 @@ public void handle() throws Exception {
     } catch (Exception e) {
       logger.error("shell task failure", e);
       exitStatusCode = -1;
+      throw e;
     }
   }
 

diff --git a/...test/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTaskTest.java b/...test/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTaskTest.java
@@ -29,7 +29,7 @@ public class DependentTaskTest {
 
 
     @Test
-    public void testDependInit(){
+    public void testDependInit() throws Exception{
 
         TaskProps taskProps = new TaskProps();