fix(notification): incorrent status of DLM task notification (#3595)

oceanbase · Sep 27, 2024 · 72e4dbb · 72e4dbb
1 parent 36d83db
commit 72e4dbb
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...ice/src/main/java/com/oceanbase/odc/service/task/listener/JobTerminateNotifyListener.java b/...ice/src/main/java/com/oceanbase/odc/service/task/listener/JobTerminateNotifyListener.java
@@ -19,13 +19,14 @@
 import org.springframework.stereotype.Component;
 
 import com.oceanbase.odc.common.event.AbstractEventListener;
+import com.oceanbase.odc.core.shared.constant.TaskStatus;
 import com.oceanbase.odc.metadb.task.JobEntity;
+import com.oceanbase.odc.service.dlm.DLMService;
 import com.oceanbase.odc.service.notification.Broker;
 import com.oceanbase.odc.service.notification.NotificationProperties;
 import com.oceanbase.odc.service.notification.helper.EventBuilder;
 import com.oceanbase.odc.service.schedule.ScheduleService;
 import com.oceanbase.odc.service.schedule.ScheduleTaskService;
-import com.oceanbase.odc.service.task.enums.JobStatus;
 import com.oceanbase.odc.service.task.service.TaskFrameworkService;
 
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +51,8 @@ public class JobTerminateNotifyListener extends AbstractEventListener<JobTermina
  private ScheduleTaskService scheduleTaskService;
  @Autowired
  private ScheduleService scheduleService;
+ @Autowired
+ private DLMService dlmService;
 
  @Override
  public void onEvent(JobTerminateEvent event) {
@@ -60,7 +63,11 @@ public void onEvent(JobTerminateEvent event) {
  JobEntity jobEntity = taskFrameworkService.find(event.getJi().getId());
  scheduleTaskService.findByJobId(jobEntity.getId())
  .ifPresent(task -> {
- broker.enqueueEvent(event.getStatus() == JobStatus.DONE ? eventBuilder.ofSucceededTask(task)
+ TaskStatus status =
+ "DLM".equalsIgnoreCase(jobEntity.getJobType())
+ ? dlmService.getFinalTaskStatus(task.getId())
+ : jobEntity.getStatus().convertTaskStatus();
+ broker.enqueueEvent(status == TaskStatus.DONE ? eventBuilder.ofSucceededTask(task)
  : eventBuilder.ofFailedTask(task));
  });
  } catch (Exception e) {