[Improvement-17304][Master/Worker] Make busy master/worker can registered (#17305)

Author: ruanwenjun

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java

@@ -20,8 +20,6 @@
 import static org.apache.dolphinscheduler.common.constants.Constants.SLEEP_TIME_MILLIS;
 
 import org.apache.dolphinscheduler.common.IStoppable;
-import org.apache.dolphinscheduler.common.enums.ServerStatus;
-import org.apache.dolphinscheduler.common.model.MasterHeartBeat;
 import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.common.utils.NetUtils;
@@ -94,13 +92,6 @@ void registry() {
         log.info("Master node : {} registering to registry center", masterConfig.getMasterAddress());
         String masterRegistryPath = masterConfig.getMasterRegistryPath();
 
-        MasterHeartBeat heartBeat = masterHeartBeatTask.getHeartBeat();
-        while (ServerStatus.BUSY.equals(heartBeat.getServerStatus())) {
-            log.warn("Master node is BUSY: {}", heartBeat);
-            heartBeat = masterHeartBeatTask.getHeartBeat();
-            ThreadUtils.sleep(SLEEP_TIME_MILLIS);
-        }
-
         // remove before persist
         registryClient.remove(masterRegistryPath);
         registryClient.persistEphemeral(masterRegistryPath, JSONUtils.toJsonString(masterHeartBeatTask.getHeartBeat()));
@@ -110,9 +101,6 @@ void registry() {
             ThreadUtils.sleep(SLEEP_TIME_MILLIS);
         }
 
-        // sleep 1s, waiting master failover remove
-        ThreadUtils.sleep(SLEEP_TIME_MILLIS);
-
         masterHeartBeatTask.start();
         log.info("Master node : {} registered to registry center successfully", masterConfig.getMasterAddress());
 

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java

@@ -20,10 +20,7 @@
 import static org.apache.dolphinscheduler.common.constants.Constants.SLEEP_TIME_MILLIS;
 
 import org.apache.dolphinscheduler.common.IStoppable;
-import org.apache.dolphinscheduler.common.constants.Constants;
-import org.apache.dolphinscheduler.common.enums.ServerStatus;
 import org.apache.dolphinscheduler.common.model.Server;
-import org.apache.dolphinscheduler.common.model.WorkerHeartBeat;
 import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.extract.base.utils.Host;
@@ -84,27 +81,18 @@ public void start() {
         }
     }
 
-    private void registry() throws InterruptedException {
-        WorkerHeartBeat workerHeartBeat = workerHeartBeatTask.getHeartBeat();
-        while (ServerStatus.BUSY.equals(workerHeartBeat.getServerStatus())) {
-            log.warn("Worker node is BUSY: {}", workerHeartBeat);
-            workerHeartBeat = workerHeartBeatTask.getHeartBeat();
-            Thread.sleep(SLEEP_TIME_MILLIS);
-        }
+    private void registry() {
         String workerRegistryPath = workerConfig.getWorkerRegistryPath();
         // remove before persist
         registryClient.remove(workerRegistryPath);
-        registryClient.persistEphemeral(workerRegistryPath, JSONUtils.toJsonString(workerHeartBeat));
+        registryClient.persistEphemeral(workerRegistryPath, JSONUtils.toJsonString(workerHeartBeatTask.getHeartBeat()));
         log.info("Worker node: {} registry to registry center {} successfully", workerConfig.getWorkerAddress(),
                 workerRegistryPath);
 
         while (!registryClient.checkNodeExists(workerConfig.getWorkerAddress(), RegistryNodeType.WORKER)) {
             ThreadUtils.sleep(SLEEP_TIME_MILLIS);
         }
 
-        // sleep 1s, waiting master failover remove
-        ThreadUtils.sleep(Constants.SLEEP_TIME_MILLIS);
-
         workerHeartBeatTask.start();
         log.info("Worker node: {} registry finished", workerConfig.getWorkerAddress());
     }