rebase dev & resolve conflict

apache · Jan 3, 2024 · 73ae07d · 73ae07d
1 parent aff0b35
commit 73ae07d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...c/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerWaitingStrategy.java b/...c/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerWaitingStrategy.java
@@ -17,6 +17,7 @@
 
 package org.apache.dolphinscheduler.server.worker.registry;
 
+
 import org.apache.dolphinscheduler.common.lifecycle.ServerLifeCycleException;
 import org.apache.dolphinscheduler.common.lifecycle.ServerLifeCycleManager;
 import org.apache.dolphinscheduler.registry.api.RegistryClient;
@@ -30,6 +31,7 @@
 import java.time.Duration;
 
 import lombok.extern.slf4j.Slf4j;
+import lombok.NonNull;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -52,6 +54,16 @@ public class WorkerWaitingStrategy implements WorkerConnectStrategy {
     @Autowired
     private WorkerTaskExecutorThreadPool workerManagerThread;
 
+    public WorkerWaitingStrategy(@NonNull WorkerConfig workerConfig,
+                                 @NonNull RegistryClient registryClient,
+                                 @NonNull MessageRetryRunner messageRetryRunner,
+                                 @NonNull WorkerTaskExecutorThreadPool workerManagerThread) {
+        this.workerConfig = workerConfig;
+        this.registryClient = registryClient;
+        this.messageRetryRunner = messageRetryRunner;
+        this.workerManagerThread = workerManagerThread;
+    }
+
     @Override
     public void disconnect() {
         try {

diff --git a/.../src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerStrategyTest.java b/.../src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerStrategyTest.java
@@ -83,7 +83,6 @@ public void testWorkerWaitingStrategyreconnect() {
         WorkerWaitingStrategy workerWaitingStrategy = new WorkerWaitingStrategy(
                 workerConfig,
                 registryClient,
-                workerRpcServer,
                 messageRetryRunner,
                 workerManagerThread
         );
@@ -120,7 +119,6 @@ public void testWorkerWaitingStrategydisconnect() {
         WorkerWaitingStrategy workerWaitingStrategy = new WorkerWaitingStrategy(
                 workerConfig,
                 registryClient,
-                workerRpcServer,
                 messageRetryRunner,
                 workerManagerThread
         );