fix(dlm): data delete failed after data archived. (#735)

Regenerate the ID for the rollback task and delete task to avoid task failure due to duplicate IDs
oceanbase · Nov 15, 2023 · 5d34514 · 5d34514
1 parent da63dfc
commit 5d34514
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...dc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveDeleteJob.java b/...dc-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveDeleteJob.java
@@ -25,6 +25,7 @@
 import com.oceanbase.odc.core.shared.constant.TaskStatus;
 import com.oceanbase.odc.metadb.schedule.ScheduleTaskEntity;
 import com.oceanbase.odc.service.dlm.model.DlmTask;
+import com.oceanbase.odc.service.dlm.utils.DlmJobIdUtil;
 import com.oceanbase.odc.service.schedule.model.DataArchiveClearParameters;
 import com.oceanbase.tools.migrator.common.enums.JobType;
 
@@ -68,6 +69,9 @@ public void execute(JobExecutionContext context) {
  List<DlmTask> taskUnits = JsonUtils.fromJson(dataArchiveTask.getResultJson(),
  new TypeReference<List<DlmTask>>() {});
  taskUnits.forEach(taskUnit -> {
+ taskUnit.setId(DlmJobIdUtil.generateHistoryJobId(taskEntity.getJobName(), taskEntity.getJobGroup(),
+ taskEntity.getId(),
+ taskUnits.size()));
  taskUnit.setJobType(JobType.DELETE);
  taskUnit.setStatus(TaskStatus.PREPARING);
  });

diff --git a/...-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveRollbackJob.java b/...-service/src/main/java/com/oceanbase/odc/service/schedule/job/DataArchiveRollbackJob.java
@@ -25,6 +25,7 @@
 import com.oceanbase.odc.core.shared.constant.TaskStatus;
 import com.oceanbase.odc.metadb.schedule.ScheduleTaskEntity;
 import com.oceanbase.odc.service.dlm.model.DlmTask;
+import com.oceanbase.odc.service.dlm.utils.DlmJobIdUtil;
 import com.oceanbase.odc.service.schedule.model.DataArchiveRollbackParameters;
 import com.oceanbase.tools.migrator.common.enums.JobType;
 
@@ -65,6 +66,9 @@ public void execute(JobExecutionContext context) {
  new TypeReference<List<DlmTask>>() {});
  taskUnits.forEach(taskUnit -> {
  Long temp = taskUnit.getSourceDatabaseId();
+ taskUnit.setId(DlmJobIdUtil.generateHistoryJobId(taskEntity.getJobName(), taskEntity.getJobGroup(),
+ taskEntity.getId(),
+ taskUnits.size()));
  taskUnit.setSourceDatabaseId(taskUnit.getTargetDatabaseId());
  taskUnit.setTargetDatabaseId(temp);
  taskUnit.setJobType(JobType.ROLLBACK);