Browse Source

#1871 correct spelling (#1872)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling
pull/2/head
Tboy 4 years ago committed by dailidong
parent
commit
0712ccc342
  1. 14
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

14
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

@ -187,7 +187,7 @@ public class MasterExecThread implements Runnable {
/** /**
* execute process * execute process
* @throws Exception excpetion * @throws Exception exception
*/ */
private void executeProcess() throws Exception { private void executeProcess() throws Exception {
prepareProcess(); prepareProcess();
@ -197,7 +197,7 @@ public class MasterExecThread implements Runnable {
/** /**
* execute complement process * execute complement process
* @throws Exception excpetion * @throws Exception exception
*/ */
private void executeComplementProcess() throws Exception { private void executeComplementProcess() throws Exception {
@ -247,7 +247,7 @@ public class MasterExecThread implements Runnable {
// execute process ,waiting for end // execute process ,waiting for end
runProcess(); runProcess();
// process instace failure ,no more complements // process instance failure ,no more complements
if(!processInstance.getState().typeIsSuccess()){ if(!processInstance.getState().typeIsSuccess()){
logger.info("process {} state {}, complement not completely!", logger.info("process {} state {}, complement not completely!",
processInstance.getId(), processInstance.getState()); processInstance.getId(), processInstance.getState());
@ -304,7 +304,7 @@ public class MasterExecThread implements Runnable {
/** /**
* prepare process parameter * prepare process parameter
* @throws Exception excpetion * @throws Exception exception
*/ */
private void prepareProcess() throws Exception { private void prepareProcess() throws Exception {
// init task queue // init task queue
@ -332,7 +332,7 @@ public class MasterExecThread implements Runnable {
/** /**
* generate process dag * generate process dag
* @throws Exception excpetion * @throws Exception exception
*/ */
private void buildFlowDag() throws Exception { private void buildFlowDag() throws Exception {
recoverNodeIdList = getStartTaskInstanceList(processInstance.getCommandParam()); recoverNodeIdList = getStartTaskInstanceList(processInstance.getCommandParam());
@ -609,7 +609,7 @@ public class MasterExecThread implements Runnable {
/** /**
* query task instance by complete state * query task instance by complete state
* @param state state * @param state state
* @return task isntance list * @return task instance list
*/ */
private List<TaskInstance> getCompleteTaskByState(ExecutionStatus state){ private List<TaskInstance> getCompleteTaskByState(ExecutionStatus state){
List<TaskInstance> resultList = new ArrayList<>(); List<TaskInstance> resultList = new ArrayList<>();
@ -804,7 +804,7 @@ public class MasterExecThread implements Runnable {
} }
/** /**
* add task to standy list * add task to standby list
* @param taskInstance task instance * @param taskInstance task instance
*/ */
private void addTaskToStandByList(TaskInstance taskInstance){ private void addTaskToStandByList(TaskInstance taskInstance){

Loading…
Cancel
Save