You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/07/19 08:56:49 UTC
[dolphinscheduler] branch 1.3.7-prepare-#5682 created (now 5404ea5)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a change to branch 1.3.7-prepare-#5682
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.
at 5404ea5 [1.3.7-prepare#5682][Improvement]spell err Pr #5682 todo UI
This branch includes the following new commits:
new 5404ea5 [1.3.7-prepare#5682][Improvement]spell err Pr #5682 todo UI
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[dolphinscheduler] 01/01: [1.3.7-prepare#5682][Improvement]spell
err Pr #5682 todo UI
Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 1.3.7-prepare-#5682
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 5404ea5c64f24458d6827b9ed9893615a3b7a01a
Author: CalvinKirs <ki...@apache.org>
AuthorDate: Mon Jul 19 16:56:17 2021 +0800
[1.3.7-prepare#5682][Improvement]spell err
Pr #5682
todo UI
---
.../dolphinscheduler/api/utils/FourLetterWordMain.java | 3 +--
.../java/org/apache/dolphinscheduler/common/Constants.java | 4 ++--
.../apache/dolphinscheduler/common/enums/CommandType.java | 2 +-
.../dolphinscheduler/common/enums/ExecutionStatus.java | 8 ++++----
.../apache/dolphinscheduler/common/enums/TaskStateType.java | 4 ++--
.../server/master/runner/MasterExecThread.java | 6 +++---
.../dolphinscheduler/server/utils/DependentExecute.java | 2 +-
.../dolphinscheduler/service/process/ProcessService.java | 12 ++++++------
8 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
index 6136c20..6e64176 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
@@ -30,7 +30,6 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketTimeoutException;
-import java.net.ConnectException;
import java.util.Objects;
public class FourLetterWordMain {
@@ -90,7 +89,7 @@ public class FourLetterWordMain {
}
return sb.toString();
}
- } catch (SocketTimeoutException | ConnectException e ) {
+ } catch (SocketTimeoutException e) {
throw new IOException("Exception while executing four letter word: " + cmd, e);
}
}
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 fe83fa1..7961471 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
@@ -836,8 +836,8 @@ public final class Constants {
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal(),
ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(),
- ExecutionStatus.WAITTING_THREAD.ordinal(),
- ExecutionStatus.WAITTING_DEPEND.ordinal()
+ ExecutionStatus.WAITING_THREAD.ordinal(),
+ ExecutionStatus.WAITING_DEPEND.ordinal()
};
/**
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
index 56fdd07..14dd763 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
@@ -47,7 +47,7 @@ public enum CommandType {
REPEAT_RUNNING(7, "repeat running a process"),
PAUSE(8, "pause a process"),
STOP(9, "stop a process"),
- RECOVER_WAITTING_THREAD(10, "recover waiting thread");
+ RECOVER_WAITING_THREAD(10, "recover waiting thread");
CommandType(int code, String descp){
this.code = code;
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 7e06849..5080bb5 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
@@ -50,8 +50,8 @@ public enum ExecutionStatus {
SUCCESS(7, "success"),
NEED_FAULT_TOLERANCE(8, "need fault tolerance"),
KILL(9, "kill"),
- WAITTING_THREAD(10, "waiting thread"),
- WAITTING_DEPEND(11, "waiting depend node complete");
+ WAITING_THREAD(10, "waiting thread"),
+ WAITING_DEPEND(11, "waiting depend node complete");
ExecutionStatus(int code, String descp){
this.code = code;
@@ -94,7 +94,7 @@ public enum ExecutionStatus {
* @return status
*/
public boolean typeIsWaitingThread(){
- return this == WAITTING_THREAD;
+ return this == WAITING_THREAD;
}
/**
@@ -117,7 +117,7 @@ public enum ExecutionStatus {
* @return status
*/
public boolean typeIsRunning(){
- return this == RUNNING_EXECUTION || this == WAITTING_DEPEND;
+ return this == RUNNING_EXECUTION || this == WAITING_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 11ab856..c6b0b0a 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
@@ -27,7 +27,7 @@ public enum TaskStateType {
* 3 failed
* 4 success
*/
- WAITTING, RUNNING, FINISH, FAILED, SUCCESS;
+ WAITING, RUNNING, FINISH, FAILED, SUCCESS;
/**
* convert task state to execute status integer array ;
@@ -53,7 +53,7 @@ public enum TaskStateType {
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal()};
- case WAITTING:
+ case WAITING:
return new int[]{
ExecutionStatus.SUBMITTED_SUCCESS.ordinal()
};
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 674acbe..702f92d 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
@@ -586,7 +586,7 @@ public class MasterExecThread implements Runnable {
private ExecutionStatus runningState(ExecutionStatus state){
if(state == ExecutionStatus.READY_STOP ||
state == ExecutionStatus.READY_PAUSE ||
- state == ExecutionStatus.WAITTING_THREAD){
+ state == ExecutionStatus.WAITING_THREAD){
// if the running task is not completed, the state remains unchanged
return state;
}else{
@@ -632,7 +632,7 @@ public class MasterExecThread implements Runnable {
* @return Boolean whether has waiting thread task
*/
private boolean hasWaitingThreadTask(){
- List<TaskInstance> waitingList = getCompleteTaskByState(ExecutionStatus.WAITTING_THREAD);
+ List<TaskInstance> waitingList = getCompleteTaskByState(ExecutionStatus.WAITING_THREAD);
return CollectionUtils.isNotEmpty(waitingList);
}
@@ -678,7 +678,7 @@ public class MasterExecThread implements Runnable {
// waiting thread
if(hasWaitingThreadTask()){
- return ExecutionStatus.WAITTING_THREAD;
+ return ExecutionStatus.WAITING_THREAD;
}
// pause
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
index 7f76baa..859737c 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
@@ -225,7 +225,7 @@ public class DependentExecute {
if(state.typeIsRunning()
|| state == ExecutionStatus.SUBMITTED_SUCCESS
- || state == ExecutionStatus.WAITTING_THREAD){
+ || state == ExecutionStatus.WAITING_THREAD){
return DependResult.WAITING;
}else{
return DependResult.FAILED;
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 5cc5aa9..e88b3f8 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
@@ -147,8 +147,8 @@ public class ProcessService {
* @return process instance
*/
private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) {
- processInstance.setState(ExecutionStatus.WAITTING_THREAD);
- if(command.getCommandType() != CommandType.RECOVER_WAITTING_THREAD){
+ processInstance.setState(ExecutionStatus.WAITING_THREAD);
+ if(command.getCommandType() != CommandType.RECOVER_WAITING_THREAD){
processInstance.addHistoryCmd(command.getCommandType());
}
saveProcessInstance(processInstance);
@@ -403,7 +403,7 @@ public class ProcessService {
// process instance quit by "waiting thread" state
if(originCommand == null){
Command command = new Command(
- CommandType.RECOVER_WAITTING_THREAD,
+ CommandType.RECOVER_WAITING_THREAD,
processInstance.getTaskDependType(),
processInstance.getFailureStrategy(),
processInstance.getExecutorId(),
@@ -420,14 +420,14 @@ public class ProcessService {
}
// update the command time if current command if recover from waiting
- if(originCommand.getCommandType() == CommandType.RECOVER_WAITTING_THREAD){
+ if(originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD){
originCommand.setUpdateTime(new Date());
saveCommand(originCommand);
}else{
// delete old command and create new waiting thread command
commandMapper.deleteById(originCommand.getId());
originCommand.setId(0);
- originCommand.setCommandType(CommandType.RECOVER_WAITTING_THREAD);
+ originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD);
originCommand.setUpdateTime(new Date());
originCommand.setCommandParam(JSONUtils.toJson(cmdParam));
originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority());
@@ -654,7 +654,7 @@ public class ProcessService {
break;
case START_CURRENT_TASK_PROCESS:
break;
- case RECOVER_WAITTING_THREAD:
+ case RECOVER_WAITING_THREAD:
break;
case RECOVER_SUSPENDED_PROCESS:
// find pause tasks and init task's state