fix AbstractTask's handle method exception (#1490) (15d5d66d) · Commits · SUMMER2020 / students / proj-2002252

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractYarnTask.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ public abstract class AbstractYarnTask extends AbstractTask {
		} catch (Exception e) {
		logger.error("yarn process failure", e);
		exitStatusCode = -1;
		throw e;
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public class DependentTask extends AbstractTask {
		}

		@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 class DependentTask extends AbstractTask {
		}catch (Exception e){
		logger.error(e.getMessage(),e);
		exitStatusCode = -1;
		throw e;
		}
		}

+11 −14

Original line number	Diff line number	Diff line
		@@ -113,8 +113,9 @@ public class HttpTask extends AbstractTask {
		long startTime = System.currentTimeMillis();
		String statusCode = null;
		String body = null;
		try(CloseableHttpClient client = createHttpClient()) {
		try(CloseableHttpResponse response = sendRequest(client)) {

		try(CloseableHttpClient client = createHttpClient();
		CloseableHttpResponse response = sendRequest(client)) {
		statusCode = String.valueOf(getStatusCode(response));
		body = getResponseBody(response);
		exitStatusCode = validResponse(body, statusCode);
		@@ -125,11 +126,7 @@ public class HttpTask extends AbstractTask {
		appendMessage(e.toString());
		exitStatusCode = -1;
		logger.error("httpUrl[" + httpParameters.getUrl() + "] connection failed："+output, e);
		}
		} catch (Exception e) {
		appendMessage(e.toString());
		exitStatusCode = -1;
		logger.error("httpUrl[" + httpParameters.getUrl() + "] connection failed："+output, e);
		throw e;
		}
		}

+4 −10

Original line number	Diff line number	Diff line
		@@ -97,14 +97,13 @@ public class ProcedureTask extends AbstractTask {
		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(),
		@@ -112,11 +111,6 @@ public class ProcedureTask extends AbstractTask {
		dataSource.getUserId(),
		dataSource.getConnectionParams());

		if (dataSource == null){
		logger.error("datasource not exists");
		exitStatusCode = -1;
		return;
		}
		Connection connection = null;
		CallableStatement stmt = null;
		try {

+1 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ public class PythonTask extends AbstractTask {
		} catch (Exception e) {
		logger.error("python task failure", e);
		exitStatusCode = -1;
		throw e;
		}
		}