Merge remote-tracking branch 'origin/ws-3.0.0' into ws-3.0.0

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/config/MasterConfig.java

@@ -76,7 +76,7 @@ public class MasterConfig implements Validator {
     /**
      * state wheel check interval, if this value is bigger, may increase the delay of task/processInstance.
      */
-    private Duration stateWheelInterval = Duration.ofMillis(5);
+    private Duration stateWheelInterval = Duration.ofSeconds(5);
     private double maxCpuLoadAvg = -1;
     private double reservedMemory = 0.3;
     private Duration failoverInterval = Duration.ofMinutes(10);

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java

@@ -197,10 +197,10 @@ public class DependentExecute {
 
         ProcessInstance lastManualProcess = processService.findLastManualProcessInterval(definitionCode, dateInterval);
 
-        if (lastManualProcess == null) {
+        if (lastManualProcess == null || lastManualProcess.getEndTime() == null) {
             return lastSchedulerProcess;
         }
-        if (lastSchedulerProcess == null) {
+        if (lastSchedulerProcess == null || lastSchedulerProcess.getEndTime() == null) {
             return lastManualProcess;
         }
 

dolphinscheduler-master/src/main/resources/application.yaml

@@ -102,7 +102,7 @@ master:
   task-commit-retry-times: 5
   # master commit task interval
   task-commit-interval: 1s
-  state-wheel-interval: 5
+  state-wheel-interval: 5s
   # master max cpuload avg, only higher than the system cpu load average, master server can schedule. default value -1: the number of cpu cores * 2
   max-cpu-load-avg: -1
   # master reserved memory, only lower than system available memory, master server can schedule. default value 0.3, the unit is G

dolphinscheduler-standalone-server/src/main/resources/application.yaml

@@ -104,7 +104,7 @@ master:
   task-commit-retry-times: 5
   # master commit task interval
   task-commit-interval: 1s
-  state-wheel-interval: 5
+  state-wheel-interval: 5s
   # master max cpuload avg, only higher than the system cpu load average, master server can schedule. default value -1: the number of cpu cores * 2
   max-cpu-load-avg: -1
   # master reserved memory, only lower than system available memory, master server can schedule. default value 0.3, the unit is G