bugfix

oceanbase · Jul 12, 2024 · baba924 · baba924
1 parent e51cbc4
commit baba924
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...vice/src/main/java/com/oceanbase/odc/service/task/schedule/daemon/DestroyExecutorJob.java b/...vice/src/main/java/com/oceanbase/odc/service/task/schedule/daemon/DestroyExecutorJob.java
@@ -89,6 +89,11 @@ private void destroyExecutor(TaskFrameworkService taskFrameworkService, JobEntit
  }
  log.info("Job destroy executor succeed, jobId={}, status={}.", lockedEntity.getId(),
  lockedEntity.getStatus());
+ } else if (lockedEntity.getStatus().isTerminated() && lockedEntity.getExecutorIdentifier() == null) {
+ // It is necessary to update the finish time when the job is terminated but the
+ // executorIdentifier is null, otherwise, the job cannot be released.
+ log.info("Executor not found, updating executor to destroyed,jobId={}", lockedEntity.getId());
+ taskFrameworkService.updateExecutorToDestroyed(lockedEntity.getId());
  }
  });
  }

diff --git a/...service/src/main/java/com/oceanbase/odc/service/task/service/StdTaskFrameworkService.java b/...service/src/main/java/com/oceanbase/odc/service/task/service/StdTaskFrameworkService.java
@@ -389,6 +389,7 @@ private void doRefreshResult(Long id) throws JobException {
  taskResultPublisherExecutor.execute(() -> publisher
  .publishEvent(new JobTerminateEvent(result.getJobIdentity(), result.getStatus())));
 
+ // TODO maybe we can destroy the pod there.
  if (result.getStatus() == JobStatus.FAILED) {
  AlarmUtils.alarm(AlarmEventNames.TASK_EXECUTION_FAILED,
  MessageFormat.format("Job execution failed, jobId={0}",