This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new 0d8777f [1.3.6-prepare][Improvement-5108][*] Rename RUNNING_EXEUTION
to RUNNING_EXECUTION (#5109)
0d8777f is described below
commit 0d8777f0c0ee2e48fbb1c4fdb85d6fec452e40df
Author: Shiwen Cheng <[email protected]>
AuthorDate: Fri Mar 19 15:25:57 2021 +0800
[1.3.6-prepare][Improvement-5108][*] Rename RUNNING_EXEUTION to
RUNNING_EXECUTION (#5109)
---
.../dolphinscheduler/api/dto/TaskCountDto.java | 8 ++++----
.../api/service/DataAnalysisServiceTest.java | 2 +-
.../api/service/ProcessDefinitionServiceTest.java | 4 ++--
.../api/service/ProcessInstanceServiceTest.java | 4 ++--
.../apache/dolphinscheduler/common/Constants.java | 2 +-
.../common/enums/ExecutionStatus.java | 4 ++--
.../dolphinscheduler/common/enums/TaskStateType.java | 2 +-
.../dolphinscheduler/common/utils/HadoopUtils.java | 2 +-
.../dao/mapper/ProcessInstanceMapperTest.java | 20 ++++++++++----------
.../dao/mapper/TaskInstanceMapperTest.java | 10 +++++-----
.../master/runner/ConditionsTaskExecThread.java | 2 +-
.../master/runner/DependentTaskExecThread.java | 2 +-
.../master/runner/MasterBaseTaskExecThread.java | 2 +-
.../server/master/runner/MasterExecThread.java | 8 ++++----
.../master/runner/SubProcessTaskExecThread.java | 2 +-
.../worker/processor/TaskExecuteProcessor.java | 2 +-
.../server/master/ConditionsTaskTest.java | 2 +-
.../server/master/DependentTaskTest.java | 2 +-
.../processor/queue/TaskResponseServiceTest.java | 4 ++--
.../server/utils/ProcessUtilsTest.java | 2 +-
.../service/process/ProcessService.java | 10 +++++-----
.../src/js/conf/home/pages/dag/_source/config.js | 2 +-
.../_source/formModel/tasks/_source/nodeStatus.vue | 4 ++--
.../pages/_source/instanceConditions/common.js | 2 +-
.../pages/instance/pages/list/_source/list.vue | 8 ++++----
25 files changed, 56 insertions(+), 56 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
index 6b0391f..cbdb9e9 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
@@ -44,7 +44,7 @@ public class TaskCountDto {
private void countTaskDtos(List<ExecuteStatusCount>
taskInstanceStateCounts){
int submittedSuccess = 0;
- int runningExeution = 0;
+ int runningExecution = 0;
int readyPause = 0;
int pause = 0;
int readyStop = 0;
@@ -62,8 +62,8 @@ public class TaskCountDto {
case SUBMITTED_SUCCESS:
submittedSuccess += taskInstanceStateCount.getCount();
break;
- case RUNNING_EXEUTION:
- runningExeution += taskInstanceStateCount.getCount();
+ case RUNNING_EXECUTION:
+ runningExecution += taskInstanceStateCount.getCount();
break;
case READY_PAUSE:
readyPause += taskInstanceStateCount.getCount();
@@ -99,7 +99,7 @@ public class TaskCountDto {
}
this.taskCountDtos = new ArrayList<>();
this.taskCountDtos.add(new
TaskStateCount(ExecutionStatus.SUBMITTED_SUCCESS, submittedSuccess));
- this.taskCountDtos.add(new
TaskStateCount(ExecutionStatus.RUNNING_EXEUTION, runningExeution));
+ this.taskCountDtos.add(new
TaskStateCount(ExecutionStatus.RUNNING_EXECUTION, runningExecution));
this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_PAUSE,
readyPause));
this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.PAUSE,
pause));
this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_STOP,
readyStop));
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
index 14612fc..6a9e786 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
@@ -180,7 +180,7 @@ public class DataAnalysisServiceTest {
List<ExecuteStatusCount> taskInstanceStateCounts = new ArrayList<>(1);
ExecuteStatusCount executeStatusCount = new ExecuteStatusCount();
-
executeStatusCount.setExecutionStatus(ExecutionStatus.RUNNING_EXEUTION);
+
executeStatusCount.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION);
taskInstanceStateCounts.add(executeStatusCount);
return taskInstanceStateCounts;
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index b9e6ed2..5edc680 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -494,7 +494,7 @@ public class ProcessDefinitionServiceTest {
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(1);
processInstance.setName("test_instance");
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setHost("192.168.xx.xx");
processInstance.setStartTime(new Date());
processInstance.setEndTime(new Date());
@@ -506,7 +506,7 @@ public class ProcessDefinitionServiceTest {
taskInstance.setTaskType("SHELL");
taskInstance.setId(1);
taskInstance.setName("test_task_instance");
- taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
taskInstance.setHost("192.168.xx.xx");
//task instance not exist
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
index 3207a12..3ec9a38 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
@@ -324,7 +324,7 @@ public class ProcessInstanceServiceTest {
//process instance not finish
when(processService.findProcessInstanceDetailById(1)).thenReturn(processInstance);
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
Map<String, Object> processInstanceNotFinishRes =
processInstanceService.updateProcessInstance(loginUser, projectName, 1,
shellJson, "2020-02-21 00:00:00", true, Flag.YES, "", "");
Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR,
processInstanceNotFinishRes.get(Constants.STATUS));
@@ -431,7 +431,7 @@ public class ProcessInstanceServiceTest {
ProcessInstance processInstance = getProcessInstance();
processInstance.setProcessInstanceJson(shellJson);
TaskInstance taskInstance = getTaskInstance();
- taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
taskInstance.setStartTime(new Date());
when(processInstanceMapper.queryDetailById(1)).thenReturn(processInstance);
when(taskInstanceMapper.queryByInstanceIdAndName(Mockito.anyInt(),
Mockito.any())).thenReturn(taskInstance);
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index b02c8dd..e7c6b3c 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -845,7 +845,7 @@ public final class Constants {
public static final int[] NOT_TERMINATED_STATES = new int[]{
ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal(),
ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(),
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
index 5956de2..7e06849 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
@@ -41,7 +41,7 @@ public enum ExecutionStatus {
* 11 waiting depend node complete
*/
SUBMITTED_SUCCESS(0, "submit success"),
- RUNNING_EXEUTION(1, "running"),
+ RUNNING_EXECUTION(1, "running"),
READY_PAUSE(2, "ready pause"),
PAUSE(3, "pause"),
READY_STOP(4, "ready stop"),
@@ -117,7 +117,7 @@ public enum ExecutionStatus {
* @return status
*/
public boolean typeIsRunning(){
- return this == RUNNING_EXEUTION || this == WAITTING_DEPEND;
+ return this == RUNNING_EXECUTION || this == WAITTING_DEPEND;
}
/**
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
index 200f907..11ab856 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java
@@ -50,7 +50,7 @@ public enum TaskStateType {
};
case RUNNING:
return new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal()};
case WAITTING:
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
index 2f21670..f586b20 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
@@ -430,7 +430,7 @@ public class HadoopUtils implements Closeable {
case Constants.RUNNING:
default:
- return ExecutionStatus.RUNNING_EXEUTION;
+ return ExecutionStatus.RUNNING_EXECUTION;
}
}
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
index 3da6e69..fc4b4f1 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
@@ -124,11 +124,11 @@ public class ProcessInstanceMapperTest {
public void testQueryByHostAndStates() {
ProcessInstance processInstance = insertOne();
processInstance.setHost("192.168.2.155");
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstanceMapper.updateById(processInstance);
int[] stateArray = new int[]{
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.SUCCESS.ordinal()};
List<ProcessInstance> processInstances =
processInstanceMapper.queryByHostAndStatus(null, stateArray);
@@ -145,7 +145,7 @@ public class ProcessInstanceMapperTest {
int[] stateArray = new int[]{
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.SUCCESS.ordinal()};
ProcessDefinition processDefinition = new ProcessDefinition();
@@ -155,7 +155,7 @@ public class ProcessInstanceMapperTest {
ProcessInstance processInstance = insertOne();
processInstance.setProcessDefinitionId(processDefinition.getId());
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setIsSubProcess(Flag.NO);
processInstance.setStartTime(new Date());
@@ -188,12 +188,12 @@ public class ProcessInstanceMapperTest {
public void testSetFailoverByHostAndStateArray() {
int[] stateArray = new int[]{
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.SUCCESS.ordinal()};
ProcessInstance processInstance = insertOne();
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setHost("192.168.2.220");
processInstanceMapper.updateById(processInstance);
String host = processInstance.getHost();
@@ -214,9 +214,9 @@ public class ProcessInstanceMapperTest {
ProcessInstance processInstance = insertOne();
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstanceMapper.updateById(processInstance);
-
processInstanceMapper.updateProcessInstanceByState(ExecutionStatus.RUNNING_EXEUTION,
ExecutionStatus.SUCCESS);
+
processInstanceMapper.updateProcessInstanceByState(ExecutionStatus.RUNNING_EXECUTION,
ExecutionStatus.SUCCESS);
ProcessInstance processInstance1 =
processInstanceMapper.selectById(processInstance.getId());
@@ -294,11 +294,11 @@ public class ProcessInstanceMapperTest {
@Test
public void testQueryLastRunningProcess() {
ProcessInstance processInstance = insertOne();
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstanceMapper.updateById(processInstance);
int[] stateArray = new int[]{
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.SUBMITTED_SUCCESS.ordinal()};
ProcessInstance processInstance1 =
processInstanceMapper.queryLastRunningProcess(processInstance.getProcessDefinitionId(),
null, null , stateArray);
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
index b224067..0175271 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
@@ -64,7 +64,7 @@ public class TaskInstanceMapperTest {
TaskInstance taskInstance = new TaskInstance();
taskInstance.setFlag(Flag.YES);
taskInstance.setName("ut task");
- taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
taskInstance.setStartTime(new Date());
taskInstance.setEndTime(new Date());
taskInstance.setTaskJson("{}");
@@ -118,7 +118,7 @@ public class TaskInstanceMapperTest {
taskInstanceMapper.updateById(task);
List<Integer> taskInstances =
taskInstanceMapper.queryTaskByProcessIdAndState(
task.getProcessInstanceId(),
- ExecutionStatus.RUNNING_EXEUTION.ordinal()
+ ExecutionStatus.RUNNING_EXECUTION.ordinal()
);
taskInstanceMapper.deleteById(task.getId());
Assert.assertNotEquals(taskInstances.size(), 0);
@@ -162,7 +162,7 @@ public class TaskInstanceMapperTest {
taskInstanceMapper.updateById(task);
List<TaskInstance> taskInstances =
taskInstanceMapper.queryByHostAndStatus(
- task.getHost(), new
int[]{ExecutionStatus.RUNNING_EXEUTION.ordinal()}
+ task.getHost(), new
int[]{ExecutionStatus.RUNNING_EXECUTION.ordinal()}
);
taskInstanceMapper.deleteById(task.getId());
Assert.assertNotEquals(taskInstances.size(), 0);
@@ -179,7 +179,7 @@ public class TaskInstanceMapperTest {
int setResult = taskInstanceMapper.setFailoverByHostAndStateArray(
task.getHost(),
- new int[]{ExecutionStatus.RUNNING_EXEUTION.ordinal()},
+ new int[]{ExecutionStatus.RUNNING_EXECUTION.ordinal()},
ExecutionStatus.NEED_FAULT_TOLERANCE
);
taskInstanceMapper.deleteById(task.getId());
@@ -268,7 +268,7 @@ public class TaskInstanceMapperTest {
ProcessInstance processInstance = new ProcessInstance();
processInstance.setProcessDefinitionId(definition.getId());
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setName("ut process");
processInstance.setStartTime(new Date());
processInstance.setEndTime(new Date());
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
index 8521dc9..53e0f0b 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
@@ -123,7 +123,7 @@ public class ConditionsTaskExecThread extends
MasterBaseTaskExecThread {
private void initTaskParameters() {
this.taskInstance.setLogPath(getTaskLogPath(taskInstance));
this.taskInstance.setHost(OSUtils.getAddr(masterConfig.getListenPort()));
- taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
taskInstance.setStartTime(new Date());
this.processService.saveTaskInstance(taskInstance);
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
index db4f239..68d8365 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
@@ -175,7 +175,7 @@ public class DependentTaskExecThread extends
MasterBaseTaskExecThread {
private void initTaskParameters() {
taskInstance.setLogPath(getTaskLogPath(taskInstance));
taskInstance.setHost(OSUtils.getAddr(masterConfig.getListenPort()));
- taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
taskInstance.setStartTime(new Date());
processService.updateTaskInstance(taskInstance);
}
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
index 10de282..6a7e1d6 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
@@ -209,7 +209,7 @@ public class MasterBaseTaskExecThread implements
Callable<Boolean> {
return true;
}
// task cannot submit when running
- if(taskInstance.getState() == ExecutionStatus.RUNNING_EXEUTION){
+ if(taskInstance.getState() == ExecutionStatus.RUNNING_EXECUTION){
logger.info(String.format("submit to task, but task [%s] state
already be running. ", taskInstance.getName()));
return true;
}
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 3bc2cb4..08cf2b5 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -288,7 +288,7 @@ public class MasterExecThread implements Runnable {
processInstance.setCommandParam(JSONUtils.toJson(cmdParam));
}
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processInstance.getProcessDefinition().getGlobalParamMap(),
processInstance.getProcessDefinition().getGlobalParamList(),
@@ -590,7 +590,7 @@ public class MasterExecThread implements Runnable {
// if the running task is not completed, the state remains
unchanged
return state;
}else{
- return ExecutionStatus.RUNNING_EXEUTION;
+ return ExecutionStatus.RUNNING_EXECUTION;
}
}
@@ -700,11 +700,11 @@ public class MasterExecThread implements Runnable {
}
// success
- if(state == ExecutionStatus.RUNNING_EXEUTION){
+ if(state == ExecutionStatus.RUNNING_EXECUTION){
List<TaskInstance> killTasks =
getCompleteTaskByState(ExecutionStatus.KILL);
if(readyToSubmitTaskQueue.size() > 0){
//tasks currently pending submission, no retries, indicating
that depend is waiting to complete
- return ExecutionStatus.RUNNING_EXEUTION;
+ return ExecutionStatus.RUNNING_EXECUTION;
}else if(CollectionUtils.isNotEmpty(killTasks)){
// tasks maybe killed manually
return ExecutionStatus.FAILURE;
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
index 7e485d6..74b1c2f 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
@@ -93,7 +93,7 @@ public class SubProcessTaskExecThread extends
MasterBaseTaskExecThread {
return false;
}
- taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
taskInstance.setStartTime(new Date());
processService.updateTaskInstance(taskInstance);
return true;
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
index 3c2a884..cc17457 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
@@ -192,7 +192,7 @@ public class TaskExecuteProcessor implements
NettyRequestProcessor {
private TaskExecuteAckCommand buildAckCommand(TaskExecutionContext
taskExecutionContext) {
TaskExecuteAckCommand ackCommand = new TaskExecuteAckCommand();
ackCommand.setTaskInstanceId(taskExecutionContext.getTaskInstanceId());
- ackCommand.setStatus(ExecutionStatus.RUNNING_EXEUTION.getCode());
+ ackCommand.setStatus(ExecutionStatus.RUNNING_EXECUTION.getCode());
ackCommand.setLogPath(taskExecutionContext.getLogPath() );
ackCommand.setHost(taskExecutionContext.getHost());
ackCommand.setStartTime(taskExecutionContext.getStartTime());
diff --git
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java
index 299d4ba..f1ee8cc 100644
---
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java
+++
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java
@@ -124,7 +124,7 @@ public class ConditionsTaskTest {
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(10112);
processInstance.setProcessDefinitionId(100001);
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
return processInstance;
}
diff --git
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java
index 66bc3af..351be8a 100644
---
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java
+++
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java
@@ -176,7 +176,7 @@ public class DependentTaskTest {
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(10111);
processInstance.setProcessDefinitionId(0);
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
return processInstance;
}
diff --git
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java
index a22663e..31222ff 100644
---
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java
+++
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java
@@ -43,7 +43,7 @@ public class TaskResponseServiceTest {
@Test
public void testAdd(){
- TaskResponseEvent taskResponseEvent =
TaskResponseEvent.newAck(ExecutionStatus.RUNNING_EXEUTION, new Date(),
+ TaskResponseEvent taskResponseEvent =
TaskResponseEvent.newAck(ExecutionStatus.RUNNING_EXECUTION, new Date(),
"", "", "", 1,null);
taskResponseService.addResponse(taskResponseEvent);
Assert.assertTrue(taskResponseService.getEventQueue().size() == 1);
@@ -57,7 +57,7 @@ public class TaskResponseServiceTest {
@Test
public void testStop(){
- TaskResponseEvent taskResponseEvent =
TaskResponseEvent.newAck(ExecutionStatus.RUNNING_EXEUTION, new Date(),
+ TaskResponseEvent taskResponseEvent =
TaskResponseEvent.newAck(ExecutionStatus.RUNNING_EXECUTION, new Date(),
"", "", "", 1,null);
taskResponseService.addResponse(taskResponseEvent);
taskResponseService.stop();
diff --git
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
index 5f8a080..a493313 100644
---
a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
+++
b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
@@ -116,7 +116,7 @@ public class ProcessUtilsTest {
appIds.add("application_1598885606600_3677");
String tenantCode = "dev";
String executePath = "/ds-exec/1/1/1";
- ExecutionStatus running = ExecutionStatus.RUNNING_EXEUTION;
+ ExecutionStatus running = ExecutionStatus.RUNNING_EXECUTION;
PowerMockito.mockStatic(HadoopUtils.class);
HadoopUtils hadoop = HadoopUtils.getInstance();
diff --git
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index f1a554f..2aa0434 100644
---
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -54,7 +54,7 @@ public class ProcessService {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final int[] stateArray = new
int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
- ExecutionStatus.RUNNING_EXEUTION.ordinal(),
+ ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal()};
@@ -462,7 +462,7 @@ public class ProcessService {
Command command,
Map<String, String>
cmdParam){
ProcessInstance processInstance = new
ProcessInstance(processDefinition);
- processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRunTimes(1);
@@ -630,7 +630,7 @@ public class ProcessService {
}
processInstance.setHost(host);
- ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXEUTION;
+ ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION;
int runTime = processInstance.getRunTimes();
switch (commandType){
case START_PROCESS:
@@ -1006,7 +1006,7 @@ public class ProcessService {
*/
private void initSubInstanceState(ProcessInstance childInstance) {
if (childInstance != null) {
- childInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+ childInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
updateProcessInstance(childInstance);
}
}
@@ -1130,7 +1130,7 @@ public class ProcessService {
// running or killed
// the task already exists in task queue
// return state
- state == ExecutionStatus.RUNNING_EXEUTION
+ state == ExecutionStatus.RUNNING_EXECUTION
|| state == ExecutionStatus.KILL
|| checkTaskExistsInTaskQueue(taskInstance)
){
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
index 56d0168..10ed59a 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
@@ -153,7 +153,7 @@ const tasksState = {
icoUnicode: 'ans-icon-dot-circle',
isSpin: false
},
- RUNNING_EXEUTION: {
+ RUNNING_EXECUTION: {
id: 1,
desc: `${i18n.$t('Executing')}`,
color: '#0097e0',
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
index 549cb11..4d5f73e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
@@ -28,7 +28,7 @@
<template v-if="isInstance">
<span class="instance-state">
<em class="iconfont ans-icon-success-solid" :class="'icon-' +
el.state" v-if="el.state === 'SUCCESS'" data-toggle="tooltip"
data-container="body" :title="$t('success')"></em>
- <em class="iconfont ans-icon-clock" :class="'icon-' + el.state"
v-if="el.state === 'RUNNING_EXEUTION'" data-toggle="tooltip"
data-container="body" :title="$t('waiting')"></em>
+ <em class="iconfont ans-icon-clock" :class="'icon-' + el.state"
v-if="el.state === 'RUNNING_EXECUTION'" data-toggle="tooltip"
data-container="body" :title="$t('waiting')"></em>
<em class="iconfont ans-icon-fail-solid" :class="'icon-' + el.state"
v-if="el.state === 'FAILURE'" data-toggle="tooltip" data-container="body"
:title="$t('failed')"></em>
</span>
</template>
@@ -79,7 +79,7 @@
// btn loading
this.isLoading = true
this.$emit('dependItemListEvent', _.concat(this.dependItemList,
this._rtNewParams()))
-
+
// remove tooltip
this._removeTip()
},
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
index 254098a..694d047 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
@@ -28,7 +28,7 @@ const stateType = [
code: 'SUBMITTED_SUCCESS',
label: `${i18n.$t('Submitted successfully')}`
}, {
- code: 'RUNNING_EXEUTION',
+ code: 'RUNNING_EXECUTION',
label: `${i18n.$t('Running')}`
}, {
code: 'READY_PAUSE',
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 0e4af86..dbfd1aa 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -63,7 +63,7 @@
</th>
</tr>
<tr v-for="(item, $index) in list" :key="item.id">
- <td width="50"><x-checkbox v-model="item.isCheck"
:disabled="item.state === 'RUNNING_EXEUTION' || item.state === 'READY_STOP' ||
item.state === 'READY_PAUSE'" @on-change="_arrDelChange"></x-checkbox></td>
+ <td width="50"><x-checkbox v-model="item.isCheck"
:disabled="item.state === 'RUNNING_EXECUTION' || item.state === 'READY_STOP' ||
item.state === 'READY_PAUSE'" @on-change="_arrDelChange"></x-checkbox></td>
<td width="50">
<span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) +
(pageSize * (pageNo - 1))))}}</span>
</td>
@@ -127,7 +127,7 @@
:title="item.state === 'STOP' ? $t('Recovery Suspend')
: $t('Stop')"
@click="_stop(item,$index)"
:icon="item.state === 'STOP' ? 'ans-icon-pause-solid'
: 'ans-icon-stop'"
- :disabled="item.state !== 'RUNNING_EXEUTION' &&
item.state != 'STOP'"></x-button>
+ :disabled="item.state !== 'RUNNING_EXECUTION' &&
item.state != 'STOP'"></x-button>
<x-button type="warning"
shape="circle"
size="xsmall"
@@ -135,7 +135,7 @@
:title="item.state === 'PAUSE' ? $t('Recovery
Suspend') : $t('Pause')"
@click="_suspend(item,$index)"
:icon="item.state === 'PAUSE' ? 'ans-icon-pause-solid'
: 'ans-icon-pause'"
- :disabled="item.state !== 'RUNNING_EXEUTION' &&
item.state !== 'PAUSE'"></x-button>
+ :disabled="item.state !== 'RUNNING_EXECUTION' &&
item.state !== 'PAUSE'"></x-button>
<x-poptip
:ref="'poptip-delete-' + $index"
placement="top-end"
@@ -517,7 +517,7 @@
},
_topCheckBoxClick (is) {
- _.map(this.list , v => v.isCheck = v.state === ('RUNNING_EXEUTION') ||
v.state === ('READY_STOP') || v.state === ('READY_PAUSE')? false : is)
+ _.map(this.list , v => v.isCheck = v.state === ('RUNNING_EXECUTION')
|| v.state === ('READY_STOP') || v.state === ('READY_PAUSE')? false : is)
this._arrDelChange()
},
_arrDelChange (v) {
