det101 commented on code in PR #17037: URL: https://github.com/apache/dolphinscheduler/pull/17037#discussion_r2026549565
########## dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkerGroupTaskDispatcherManager.java: ########## @@ -0,0 +1,174 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler.server.master.runner; + +import org.apache.dolphinscheduler.dao.entity.WorkerGroup; +import org.apache.dolphinscheduler.dao.utils.WorkerGroupUtils; +import org.apache.dolphinscheduler.server.master.cluster.WorkerGroupChangeNotifier; +import org.apache.dolphinscheduler.server.master.engine.task.client.ITaskExecutorClient; +import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable; + +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +import javax.annotation.PostConstruct; + +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * WorkerGroupTaskDispatcherManager is responsible for managing the task dispatching for worker groups. + * It maintains a mapping of worker groups to their task dispatchers and priority delay queues, + * and supports adding tasks, starting and stopping worker groups, as well as cleaning up resources upon shutdown. + */ +@Component +@Slf4j +public class WorkerGroupTaskDispatcherManager implements AutoCloseable, WorkerGroupChangeNotifier.WorkerGroupListener { + + @Autowired + private ITaskExecutorClient taskExecutorClient; + + @Getter + private final ConcurrentHashMap<String, WorkerGroupTaskDispatcher> dispatchWorkerMap; + + public WorkerGroupTaskDispatcherManager() { + dispatchWorkerMap = new ConcurrentHashMap<>(); + } + + @PostConstruct + public void init() { + this.addWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup()); + } + + /** + * Adds a task to the specified worker group queue and starts or wakes up the corresponding processing loop. + * + * @param workerGroup the identifier for the worker group, used to distinguish different task queues + * @param taskExecutionRunnable an instance of ITaskExecutionRunnable representing the task to be executed + * @param delayTimeMills the delay time before the task is executed, in milliseconds + */ + public synchronized boolean addTaskToWorkerGroup(String workerGroup, ITaskExecutionRunnable taskExecutionRunnable, + long delayTimeMills) { + WorkerGroupTaskDispatcher workerGroupTaskDispatcher = dispatchWorkerMap.get(workerGroup); + if (workerGroupTaskDispatcher != null) { + if (workerGroupTaskDispatcher.checkCloseDispatchWorkerComplete()) { + dispatchWorkerMap.remove(workerGroup); + return false; + } + return workerGroupTaskDispatcher.addTaskToWorkerGroupQueue(taskExecutionRunnable, delayTimeMills); + } else { + log.error("workerGroupTaskDispatcher {} not found, will set task {} fail", + workerGroup, taskExecutionRunnable.getTaskInstance().getId()); + } + return false; + } + + /** + * Stops a specific worker group's task dispatch waiting queue looper. + * + * @param workerGroup the identifier for the worker group + */ + private synchronized void deleteWorkerGroup(String workerGroup) { + WorkerGroupTaskDispatcher workerGroupTaskDispatcher = dispatchWorkerMap.get(workerGroup); + if (workerGroupTaskDispatcher != null) { + workerGroupTaskDispatcher.markDispatcherClosing(); + } else { + log.warn("workerGroupTaskDispatcher {} not found", workerGroup); + } + } + + /** + * add workerGroup + * + * @param workerGroup the identifier for the worker group + */ + private synchronized void addWorkerGroup(String workerGroup) { + WorkerGroupTaskDispatcher workerGroupTaskDispatcher = dispatchWorkerMap.get(workerGroup); + if (workerGroupTaskDispatcher == null) { + workerGroupTaskDispatcher = new WorkerGroupTaskDispatcher(workerGroup, taskExecutorClient); + dispatchWorkerMap.put(workerGroup, workerGroupTaskDispatcher); + workerGroupTaskDispatcher.start(); + } else { + workerGroupTaskDispatcher.markDispatcherStart(); + } + } + + /** + * Stop all workerGroupTaskDispatchWaitingQueueLooper + */ + @Override + public void close() throws Exception { + log.info("WorkerGroupTaskDispatcherManager start close"); + for (Map.Entry<String, WorkerGroupTaskDispatcher> entry : dispatchWorkerMap.entrySet()) { + try { + entry.getValue().markDispatcherClosing(); + } catch (Exception e) { + log.error("stop worker group error", e); + } + } + log.info("WorkerGroupTaskDispatcherManager closed"); + } + + @Override + public void onWorkerGroupAdd(List<WorkerGroup> workerGroups) { + this.checkAndRemoveClosedDispatchWorker(); + for (WorkerGroup workerGroup : workerGroups) { + this.addWorkerGroup(workerGroup.getName()); + } + } + + @Override + public void onWorkerGroupChange(List<WorkerGroup> workerGroups) { + this.checkAndRemoveClosedDispatchWorker(); + String workerGroupsString = workerGroups.stream() + .map(WorkerGroup::getName) + .collect(Collectors.joining(", ")); + log.info("Worker groups: {}", workerGroupsString); + } + + @Override + public void onWorkerGroupDelete(List<WorkerGroup> workerGroups) { + for (WorkerGroup workerGroup : workerGroups) { + try { + this.deleteWorkerGroup(workerGroup.getName()); + } catch (Exception e) { + log.error("stop worker group error", e); Review Comment: Thank you very much for your suggestions! I completely agree with your changes and they do make the code clearer. I will make the changes according to your suggestions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
