未验证 提交 f1b498ce 编写于 作者: journey2018's avatar journey2018 提交者: GitHub

Dev 1.1.0 (#656)

* Filtering the log of one task to the log of another task

* Filtering the log of one task to the log of another task update

* rollback

* The log shows confusion

* update loggerserver

* update

* datasource connect error modify

* rollback code,logger server log filter ,process variables modify local variables

* Client ip changes, sessionId cannot be accessed modify

* mr and spark task tenant queue set error modify

* tenant queryById modify

* update

* update

* update

* update

* TaskSchedulerThread TaskProps setTenantCode
上级 d1d44862
......@@ -181,10 +181,11 @@ public class TaskScheduleThread implements Callable<Boolean> {
);
status = ExecutionStatus.FAILURE;
}else{
taskProps.setQueue(taskInstance.getProcessInstance().getQueue());
taskProps.setTaskStartTime(taskInstance.getStartTime());
taskProps.setDefinedParams(allParamMap);
// set tenantCode
taskProps.setTenantCode(tenant.getTenantCode());
// set task timeout
setTaskTimeout(taskProps, taskNode);
......
......@@ -134,7 +134,7 @@ public abstract class AbstractCommandExecutor {
createCommandFileIfNotExists(execCommand, commandFilePath);
//build process
Process process = buildProcess(commandFilePath);
buildProcess(commandFilePath);
// parse process output
parseProcessOutput(process);
......@@ -186,7 +186,7 @@ public abstract class AbstractCommandExecutor {
* @param commandFile
* @throws IOException
*/
private Process buildProcess(String commandFile) throws IOException {
private void buildProcess(String commandFile) throws IOException {
//init process builder
ProcessBuilder processBuilder = new ProcessBuilder();
// setting up a working directory
......@@ -200,8 +200,6 @@ public abstract class AbstractCommandExecutor {
// print command
printCommand(processBuilder);
return process;
}
/**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册