Merge branch 'dev' into Improvement-18056-registry-syc

SbloodyS · web-flow · commit 3ea3e1a55998 · 2026-04-15T10:14:43.000+08:00
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/event/TaskFailoverLifecycleEvent.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/event/TaskFailoverLifecycleEvent.java
@@ -40,6 +40,7 @@ public ILifecycleEventType getEventType() {
         return TaskLifecycleEventType.FAILOVER;
     }
 
+    @Override
     public String toString() {
         return "TaskFailoverLifecycleEvent{" +
                 "task=" + taskExecution.getName() +
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/lifecycle/event/WorkflowSucceedLifecycleEvent.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/lifecycle/event/WorkflowSucceedLifecycleEvent.java
@@ -40,6 +40,7 @@ public ILifecycleEventType getEventType() {
         return WorkflowLifecycleEventType.SUCCEED;
     }
 
+    @Override
     public String toString() {
         return "WorkflowSucceedLifecycleEvent{" +
                 "workflow=" + workflowExecution.getName() +
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/listener/WorkflowSuccessLifecycleListener.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/listener/WorkflowSuccessLifecycleListener.java
@@ -51,6 +51,7 @@ public class WorkflowSuccessLifecycleListener implements IWorkflowLifecycleListe
     @Autowired
     private CommandDao commandDao;
 
+    @Override
     public void notifyWorkflowLifecycleEvent(final IWorkflowExecution workflowExecution,
                                              final AbstractWorkflowLifecycleLifecycleEvent lifecycleEvent) {
         final WorkflowInstance workflowInstance = workflowExecution.getWorkflowInstance();
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/failover/FailoverCoordinator.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/failover/FailoverCoordinator.java
@@ -255,7 +255,7 @@ private void doWorkerFailover(final String workerAddress,
         log.info("Worker[{}] failover {} tasks finished, cost: {}/ms",
                 workerAddress,
                 needFailoverTasks.size(),
-                failoverTimeCost.getTime());
+                failoverTimeCost.getDuration());
     }
 
     private List<ITaskExecution> getFailoverTaskForWorker(final String workerAddress,
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/cron/CronUtils.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/cron/CronUtils.java
@@ -18,8 +18,6 @@
 package org.apache.dolphinscheduler.service.cron;
 
 import static com.cronutils.model.CronType.QUARTZ;
-import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
-import static org.apache.dolphinscheduler.common.constants.Constants.COMMA;
 import static org.apache.dolphinscheduler.service.cron.CycleFactory.day;
 import static org.apache.dolphinscheduler.service.cron.CycleFactory.hour;
 import static org.apache.dolphinscheduler.service.cron.CycleFactory.min;
@@ -35,18 +33,14 @@
 import org.apache.dolphinscheduler.service.exceptions.CronParseException;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -206,17 +200,6 @@ public static List<ZonedDateTime> getSelfFireDateList(@NonNull ZonedDateTime sta
         return executeTimes;
     }
 
-    public static List<Date> getSelfFireDateList(@NonNull final Date startTime,
-                                                 @NonNull final Date endTime,
-                                                 @NonNull final List<Schedule> schedules) throws CronParseException {
-        ZonedDateTime zonedDateTimeStart = ZonedDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault());
-        ZonedDateTime zonedDateTimeEnd = ZonedDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault());
-
-        return getSelfFireDateList(zonedDateTimeStart, zonedDateTimeEnd, schedules).stream()
-                .map(zonedDateTime -> new Date(zonedDateTime.toInstant().toEpochMilli()))
-                .collect(Collectors.toList());
-    }
-
     /**
      * gets all scheduled times for a period of time based on self dependency
      * if schedulers is empty then default scheduler = 1 day
@@ -301,22 +284,4 @@ private static Date getEndTime(Date date) {
         return end.getTime();
     }
 
-    /**
-     * get Schedule Date
-     *
-     * @param param
-     * @return date list
-     */
-    public static List<Date> getSelfScheduleDateList(Map<String, String> param) {
-        List<Date> result = new ArrayList<>();
-        String scheduleDates = param.get(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST);
-        if (StringUtils.isNotEmpty(scheduleDates)) {
-            for (String stringDate : scheduleDates.split(COMMA)) {
-                result.add(DateUtils.stringToDate(stringDate.trim()));
-            }
-            return result;
-        }
-        return null;
-    }
-
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/CronParseException.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/CronParseException.java
@@ -19,11 +19,8 @@
 
 public class CronParseException extends Exception {
 
-    public CronParseException(String message) {
-        super(message);
-    }
-
     public CronParseException(String message, Throwable throwable) {
         super(message, throwable);
     }
+
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@@ -64,7 +64,6 @@
 import org.apache.dolphinscheduler.dao.repository.WorkflowInstanceDao;
 import org.apache.dolphinscheduler.plugin.task.api.parameters.SubWorkflowParameters;
 import org.apache.dolphinscheduler.plugin.task.api.parameters.TaskTimeoutParameter;
-import org.apache.dolphinscheduler.service.expand.CuringParamsService;
 import org.apache.dolphinscheduler.service.model.TaskNode;
 import org.apache.dolphinscheduler.service.utils.ClusterConfUtils;
 import org.apache.dolphinscheduler.service.utils.DagHelper;
@@ -156,9 +155,6 @@ public class ProcessServiceImpl implements ProcessService {
     @Autowired
     private ClusterMapper clusterMapper;
 
-    @Autowired
-    private CuringParamsService curingGlobalParamsService;
-
     /**
      * find workflow instance detail by id
      *
@@ -737,7 +733,6 @@ public List<TaskNode> transformTask(List<WorkflowTaskRelation> taskRelationList,
      * @param clusterName clusterName
      * @return datasource
      */
-
     @Override
     public String findConfigYamlByName(String clusterName) {
         if (Strings.isNullOrEmpty(clusterName)) {
diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/command/MessageServiceImplTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/command/MessageServiceImplTest.java
@@ -23,7 +23,6 @@
 import org.apache.dolphinscheduler.dao.entity.Command;
 import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
 import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
-import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,9 +47,6 @@ class MessageServiceImplTest {
     @Mock
     private CommandMapper commandMapper;
 
-    @Mock
-    private WorkflowDefinitionMapper processDefineMapper;
-
     @Mock
     private ScheduleMapper scheduleMapper;
 
diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
@@ -31,15 +31,11 @@
 import org.apache.dolphinscheduler.dao.entity.WorkflowTaskRelationLog;
 import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
 import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
-import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
 import org.apache.dolphinscheduler.dao.mapper.UserMapper;
-import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionLogMapper;
 import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
-import org.apache.dolphinscheduler.dao.mapper.WorkflowInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.WorkflowTaskRelationLogMapper;
 import org.apache.dolphinscheduler.dao.repository.TaskDefinitionDao;
 import org.apache.dolphinscheduler.dao.repository.TaskDefinitionLogDao;
-import org.apache.dolphinscheduler.service.expand.CuringParamsService;
 import org.apache.dolphinscheduler.service.model.TaskNode;
 
 import java.util.ArrayList;
@@ -70,12 +66,6 @@ public class ProcessServiceTest {
     @Mock
     private WorkflowDefinitionMapper workflowDefinitionMapper;
 
-    @Mock
-    private WorkflowInstanceMapper workflowInstanceMapper;
-
-    @Mock
-    private WorkflowDefinitionLogMapper workflowDefinitionLogMapper;
-
     @Mock
     private TaskDefinitionDao taskDefinitionDao;
 
@@ -91,12 +81,6 @@ public class ProcessServiceTest {
     @Mock
     private TaskDefinitionMapper taskDefinitionMapper;
 
-    @Mock
-    private TaskGroupQueueMapper taskGroupQueueMapper;
-
-    @Mock
-    CuringParamsService curingGlobalParamsService;
-
     @Test
     public void testGetUserById() {
         User user = new User();
diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml
@@ -53,6 +53,30 @@
             <groupId>com.huaweicloud</groupId>
             <artifactId>esdk-obs-java-bundle</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/src/main/java/org/apache/dolphinscheduler/plugin/storage/obs/ObsStorageOperator.java b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/src/main/java/org/apache/dolphinscheduler/plugin/storage/obs/ObsStorageOperator.java
@@ -183,19 +183,27 @@ public List<String> fetchFileContent(String filePath, int skipLineNums, int limi
 
     @Override
     public List<StorageEntity> listStorageEntity(String resourceAbsolutePath) {
-        resourceAbsolutePath = transformObsKeyToAbsolutePath(resourceAbsolutePath);
+        String obsResourceAbsolutePath = transformAbsolutePathToObsKey(resourceAbsolutePath);
 
         ListObjectsRequest request = new ListObjectsRequest();
         request.setBucketName(bucketName);
-        request.setPrefix(resourceAbsolutePath);
+        request.setPrefix(obsResourceAbsolutePath);
         request.setDelimiter("/");
 
         ObjectListing result = obsClient.listObjects(request);
 
-        return result.getObjects()
+        List<StorageEntity> storageEntities = new ArrayList<>();
+        storageEntities.addAll(result.getCommonPrefixes()
+                .stream()
+                .map(this::transformCommonPrefixToStorageEntity)
+                .collect(Collectors.toList()));
+        storageEntities.addAll(result.getObjects()
                 .stream()
+                .filter(object -> !object.getObjectKey().equals(obsResourceAbsolutePath))
                 .map(this::transformObsObjectToStorageEntity)
-                .collect(Collectors.toList());
+                .collect(Collectors.toList()));
+
+        return storageEntities;
     }
 
     @Override
@@ -266,6 +274,21 @@ protected StorageEntity transformObsObjectToStorageEntity(ObsObject object) {
                 .build();
     }
 
+    private StorageEntity transformCommonPrefixToStorageEntity(String commonPrefix) {
+        String absolutePath = transformObsKeyToAbsolutePath(commonPrefix);
+        ResourceMetadata resourceMetaData = getResourceMetaData(absolutePath);
+
+        StorageEntity entity = new StorageEntity();
+        entity.setFileName(new File(absolutePath).getName());
+        entity.setFullName(absolutePath);
+        entity.setDirectory(resourceMetaData.isDirectory());
+        entity.setType(resourceMetaData.getResourceType());
+        entity.setSize(0L);
+        entity.setCreateTime(null);
+        entity.setUpdateTime(null);
+        return entity;
+    }
+
     private String transformAbsolutePathToObsKey(String absolutePath) {
         ResourceMetadata resourceMetaData = getResourceMetaData(absolutePath);
         if (resourceMetaData.isDirectory()) {
diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/src/test/java/org/apache/dolphinscheduler/plugin/storage/obs/ObsStorageOperatorTest.java b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/src/test/java/org/apache/dolphinscheduler/plugin/storage/obs/ObsStorageOperatorTest.java
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
diff --git a/dolphinscheduler-ui/pnpm-lock.yaml b/dolphinscheduler-ui/pnpm-lock.yaml
diff --git a/dolphinscheduler-ui/src/service/service.ts b/dolphinscheduler-ui/src/service/service.ts

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public ILifecycleEventType getEventType() {`
`40`	`40`	`return TaskLifecycleEventType.FAILOVER;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ @Override`
`43`	`44`	`public String toString() {`
`44`	`45`	`return "TaskFailoverLifecycleEvent{" +`
`45`	`46`	`"task=" + taskExecution.getName() +`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private void doWorkerFailover(final String workerAddress,`
`255`	`255`	`log.info("Worker[{}] failover {} tasks finished, cost: {}/ms",`
`256`	`256`	`workerAddress,`
`257`	`257`	`needFailoverTasks.size(),`
`258`		`- failoverTimeCost.getTime());`
	`258`	`+ failoverTimeCost.getDuration());`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`private List<ITaskExecution> getFailoverTaskForWorker(final String workerAddress,`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,8 @@`
`19`	`19`
`20`	`20`	`public class CronParseException extends Exception {`
`21`	`21`
`22`		`- public CronParseException(String message) {`
`23`		`- super(message);`
`24`		`- }`
`25`		`-`
`26`	`22`	`public CronParseException(String message, Throwable throwable) {`
`27`	`23`	`super(message, throwable);`
`28`	`24`	`}`
	`25`	`+`
`29`	`26`	`}`