Skip to content

Commit 3d51ba4

Browse files
authored
fix(alarm): task alarm add exception message (#3004)
* fix * fix
1 parent 660047a commit 3d51ba4

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

server/odc-service/src/main/java/com/oceanbase/odc/service/task/schedule/daemon/DestroyExecutorJob.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ private void destroyExecutor(TaskFrameworkService taskFrameworkService, JobEntit
8282
if (e.getMessage() != null &&
8383
!e.getMessage().startsWith(JobConstants.ODC_EXECUTOR_CANNOT_BE_DESTROYED)) {
8484
AlarmUtils.alarm(AlarmEventNames.TASK_EXECUTOR_DESTROY_FAILED,
85-
MessageFormat.format("Job executor destroy failed, jobId={0}",
86-
lockedEntity.getId()));
85+
MessageFormat.format("Job executor destroy failed, jobId={0}, message={1}",
86+
lockedEntity.getId(), e.getMessage()));
8787
}
8888
throw new TaskRuntimeException(e);
8989
}

server/odc-service/src/main/java/com/oceanbase/odc/service/task/schedule/daemon/DoCancelingJob.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ private void cancelJob(TaskFrameworkService taskFrameworkService, JobEntity jobE
8787
} catch (JobException e) {
8888
log.warn("Stop job occur error: ", e);
8989
AlarmUtils.alarm(AlarmEventNames.TASK_CANCELED_FAILED,
90-
MessageFormat.format("Cancel job failed, jobId={0}", lockedEntity.getId()));
90+
MessageFormat.format("Cancel job failed, jobId={0}, message={1}", lockedEntity.getId(),
91+
e.getMessage()));
9192
throw new TaskRuntimeException(e);
9293
}
9394
log.info("Job be cancelled successfully, jobId={}, oldStatus={}.", lockedEntity.getId(),

server/odc-service/src/main/java/com/oceanbase/odc/service/task/schedule/daemon/StartPreparingJob.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ private void startJob(TaskFrameworkService taskFrameworkService, JobEntity jobEn
113113
getConfiguration().getJobDispatcher().start(jc);
114114
} catch (JobException e) {
115115
AlarmUtils.alarm(AlarmEventNames.TASK_START_FAILED,
116-
MessageFormat.format("Start job failed, jobId={0}", lockedEntity.getId()));
116+
MessageFormat.format("Start job failed, jobId={0}, message={1}", lockedEntity.getId(),
117+
e.getMessage()));
117118
throw new TaskRuntimeException(e);
118119
}
119120
} else {

server/odc-service/src/main/java/com/oceanbase/odc/service/task/service/StdTaskFrameworkService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.oceanbase.odc.common.event.EventPublisher;
4848
import com.oceanbase.odc.common.jpa.SpecificationUtil;
4949
import com.oceanbase.odc.common.json.JsonUtils;
50+
import com.oceanbase.odc.common.security.SensitiveDataUtils;
5051
import com.oceanbase.odc.common.trace.TraceContextHolder;
5152
import com.oceanbase.odc.common.util.StringUtils;
5253
import com.oceanbase.odc.common.util.SystemUtils;
@@ -329,8 +330,9 @@ public void handleResult(TaskResult taskResult) {
329330
.publishEvent(new JobTerminateEvent(taskResult.getJobIdentity(), taskResult.getStatus())));
330331
if (taskResult.getStatus() == JobStatus.FAILED) {
331332
AlarmUtils.alarm(AlarmEventNames.TASK_EXECUTION_FAILED,
332-
MessageFormat.format("Job execution failed, jobId={0}",
333-
taskResult.getJobIdentity().getId()));
333+
MessageFormat.format("Job execution failed, jobId={0}, resultJson={1}",
334+
taskResult.getJobIdentity().getId(),
335+
SensitiveDataUtils.mask(taskResult.getResultJson())));
334336
}
335337
}
336338
}

0 commit comments

Comments
 (0)