natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh server startup time when recovery from waiting (#11595)

This commit is contained in:
Wenjun Ruan 2022-08-22 22:36:49 +08:00 committed by GitHub
parent 17a9dd25fa
commit c110f4acae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/lifecycle/ServerLifeCycleManager.java
View File

@ -24,6 +24,12 @@ public class ServerLifeCycleManager {
private static volatile ServerStatus serverStatus = ServerStatus.RUNNING;
private static long serverStartupTime = System.currentTimeMillis();
public static long getServerStartupTime() {
return serverStartupTime;
}
public static boolean isRunning() {
return serverStatus == ServerStatus.RUNNING;
}
@ -61,6 +67,7 @@ public class ServerLifeCycleManager {
if (serverStatus != ServerStatus.WAITING) {
throw new ServerLifeCycleException("The current server status is not waiting, cannot recover form waiting");
}
serverStartupTime = System.currentTimeMillis();
serverStatus = ServerStatus.RUNNING;
}

1
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/HeartBeatTask.java
View File

@ -74,6 +74,7 @@ public class HeartBeatTask implements Runnable {
if (!ServerLifeCycleManager.isRunning()) {
return;
}
heartBeat.setStartupTime(ServerLifeCycleManager.getServerStartupTime());
// update waiting task count
heartBeat.setWorkerWaitingTaskCount(workerWaitingTaskCount);