From 8f3a23dae5c4cf1fda239d7c35bcc57c76236f1d Mon Sep 17 00:00:00 2001 From: ralphgj Date: Fri, 31 Mar 2023 11:18:17 +0800 Subject: [PATCH] [Fix-13828][api] Fix the problem of work groups have two defult records (#13829) --- .../api/service/impl/WorkerGroupServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java index adadf66529..afbc75a03c 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java @@ -292,9 +292,9 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro } else { workerGroups = workerGroupMapper.queryAllWorkerGroup(); } - Optional containDefaultWorkerGroups = workerGroups.stream() - .map(workerGroup -> Constants.DEFAULT_WORKER_GROUP.equals(workerGroup.getName())).findAny(); - if (!containDefaultWorkerGroups.isPresent() || !containDefaultWorkerGroups.get()) { + boolean containDefaultWorkerGroups = workerGroups.stream() + .anyMatch(workerGroup -> Constants.DEFAULT_WORKER_GROUP.equals(workerGroup.getName())); + if (!containDefaultWorkerGroups) { // there doesn't exist a default WorkerGroup, we will add all worker to the default worker group. Set activeWorkerNodes = registryClient.getServerNodeSet(NodeType.WORKER); WorkerGroup defaultWorkerGroup = new WorkerGroup();