Browse Source

[2.0.1-cherry-pick] fix bug : Tez state, complement data kill, dependent node (#7188)

* [Fix-7037][dolphincheduler-server] process instance can not be killed when complement data (#7140)

* fix bug 7037

* update processComplementData

Co-authored-by: SbloodyS <sbloodys@qq.com>

* [Fix-5551][common] Fix ExecutionStatus for hive-on-Tez application (#6289)

* add ENDED state

* Update HadoopUtils.java

* [Fix-7093][dolphincheduler-server] fix dependent node stuck in running (#7116)

* fix bug 7093

* remove redundant else

Co-authored-by: SbloodyS <sbloodys@qq.com>

Co-authored-by: SbloodyS <460888207@qq.com>
Co-authored-by: SbloodyS <sbloodys@qq.com>
Co-authored-by: Manhua <kevinjmh@qq.com>
2.0.7-release
wind 3 years ago committed by GitHub
parent
commit
0b376f7f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
  2. 1
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
  3. 3
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
  4. 4
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

@ -658,6 +658,10 @@ public final class Constants {
* SUCCEEDED
*/
public static final String SUCCEEDED = "SUCCEEDED";
/**
* ENDED
*/
public static final String ENDED = "ENDED";
/**
* NEW
*/

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java

@ -453,6 +453,7 @@ public class HadoopUtils implements Closeable {
case Constants.ACCEPTED:
return ExecutionStatus.SUBMITTED_SUCCESS;
case Constants.SUCCEEDED:
case Constants.ENDED:
return ExecutionStatus.SUCCESS;
case Constants.NEW:
case Constants.NEW_SAVING:

3
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java

@ -91,9 +91,8 @@ public class StateWheelExecuteThread extends Thread {
for (TaskInstance taskInstance : this.taskInstanceCheckList.values()) {
if (TimeoutFlag.OPEN == taskInstance.getTaskDefine().getTimeoutFlag()) {
long timeRemain = DateUtils.getRemainTime(taskInstance.getStartTime(), taskInstance.getTaskDefine().getTimeout() * Constants.SEC_2_MINUTES_TIME_UNIT);
if (0 <= timeRemain && processTimeout(taskInstance)) {
if (0 >= timeRemain && processTimeout(taskInstance)) {
taskInstanceCheckList.remove(taskInstance.getId());
return;
}
}
if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {

4
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

@ -404,6 +404,10 @@ public class WorkflowExecuteThread implements Runnable {
return false;
}
if (processInstance.getState() == ExecutionStatus.READY_STOP) {
return false;
}
Date scheduleDate = processInstance.getScheduleTime();
if (scheduleDate == null) {
scheduleDate = complementListDate.get(0);

Loading…
Cancel
Save