[dolphinscheduler] branch dev updated: Exclude DataSourceAutoConfiguration in WorkerServer (#14957)

[wenjun]

This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new ab29ae77c1 Exclude DataSourceAutoConfiguration in WorkerServer (#14957)
ab29ae77c1 is described below

commit ab29ae77c134f0909756ce2ff56d962502cfe2fa
Author: Wenjun Ruan <wen...@apache.org>
AuthorDate: Sat Sep 23 22:01:54 2023 +0800

    Exclude DataSourceAutoConfiguration in WorkerServer (#14957)
---
 .../apache/dolphinscheduler/server/worker/WorkerServer.java    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git 
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
 
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index cb301f9468..c8f07884ec 100644
--- 
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++ 
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -26,7 +26,6 @@ import 
org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContextCacheMana
 import org.apache.dolphinscheduler.plugin.task.api.TaskPluginManager;
 import org.apache.dolphinscheduler.plugin.task.api.utils.LogUtils;
 import org.apache.dolphinscheduler.plugin.task.api.utils.ProcessUtils;
-import org.apache.dolphinscheduler.server.worker.config.WorkerConfig;
 import org.apache.dolphinscheduler.server.worker.message.MessageRetryRunner;
 import org.apache.dolphinscheduler.server.worker.registry.WorkerRegistryClient;
 import org.apache.dolphinscheduler.server.worker.rpc.WorkerRpcServer;
@@ -44,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -51,10 +51,7 @@ import 
org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableTransactionManagement
 @ComponentScan(basePackages = "org.apache.dolphinscheduler", excludeFilters = {
-        @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
-                "org.apache.dolphinscheduler.service.process.*",
-                "org.apache.dolphinscheduler.service.queue.*",
-        })
+        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = 
DataSourceAutoConfiguration.class)
 })
 @Slf4j
 public class WorkerServer implements IStoppable {
@@ -74,9 +71,6 @@ public class WorkerServer implements IStoppable {
     @Autowired
     private MessageRetryRunner messageRetryRunner;
 
-    @Autowired
-    private WorkerConfig workerConfig;
-
     @Autowired
     private GlobalTaskInstanceDispatchQueueLooper 
globalTaskInstanceDispatchQueueLooper;