Unverified Commit 134ee64d authored by aiwenmo's avatar aiwenmo Committed by GitHub

[Feature-946][alarm] Alarm after task monitoring retry (#992)

* [Feature-946][alarm] Alarm after task monitoring retry

* Format code
Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent 7bd1d5be
...@@ -77,6 +77,7 @@ public class FlinkJobTask implements DaemonTask { ...@@ -77,6 +77,7 @@ public class FlinkJobTask implements DaemonTask {
&& Duration.between(jobInstance.getFinishTime(), LocalDateTime.now()).toMinutes() < 1)) { && Duration.between(jobInstance.getFinishTime(), LocalDateTime.now()).toMinutes() < 1)) {
DefaultThreadPool.getInstance().execute(this); DefaultThreadPool.getInstance().execute(this);
} else { } else {
taskService.handleJobDone(jobInstance);
FlinkJobTaskPool.getInstance().remove(config.getId().toString()); FlinkJobTaskPool.getInstance().remove(config.getId().toString());
} }
} }
......
...@@ -42,7 +42,7 @@ public class SecurityAspect { ...@@ -42,7 +42,7 @@ public class SecurityAspect {
// 敏感信息的pattern : // 敏感信息的pattern :
// 'password' = 'wwz@test' // 'password' = 'wwz@test'
public static final String SENSITIVE = "'password'\\s+=\\s+'.+?'"; public static final String SENSITIVE = "'password'\\s*=\\s*'.+?'";
// 敏感信息屏蔽码 // 敏感信息屏蔽码
public static final String MASK = "'password'='******'"; public static final String MASK = "'password'='******'";
......
...@@ -97,6 +97,8 @@ public interface TaskService extends ISuperService<Task> { ...@@ -97,6 +97,8 @@ public interface TaskService extends ISuperService<Task> {
Result uploadTaskJson(MultipartFile file) throws Exception; Result uploadTaskJson(MultipartFile file) throws Exception;
void handleJobDone(JobInstance jobInstance);
Result queryAllCatalogue(); Result queryAllCatalogue();
Result<List<Task>> queryOnLineTaskByDoneStatus(List<JobLifeCycle> jobLifeCycle Result<List<Task>> queryOnLineTaskByDoneStatus(List<JobLifeCycle> jobLifeCycle
......
...@@ -809,7 +809,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen ...@@ -809,7 +809,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
if (JobStatus.isDone(jobInfoDetail.getInstance().getStatus()) && !status.equals(jobInfoDetail.getInstance().getStatus())) { if (JobStatus.isDone(jobInfoDetail.getInstance().getStatus()) && !status.equals(jobInfoDetail.getInstance().getStatus())) {
jobStatusChanged = true; jobStatusChanged = true;
jobInfoDetail.getInstance().setFinishTime(LocalDateTime.now()); jobInfoDetail.getInstance().setFinishTime(LocalDateTime.now());
handleJobDone(jobInfoDetail.getInstance()); // handleJobDone(jobInfoDetail.getInstance());
} }
if (isCoercive) { if (isCoercive) {
DaemonFactory.addTask(DaemonTaskConfig.build(FlinkJobTask.TYPE, jobInfoDetail.getInstance().getId())); DaemonFactory.addTask(DaemonTaskConfig.build(FlinkJobTask.TYPE, jobInfoDetail.getInstance().getId()));
...@@ -1061,7 +1061,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen ...@@ -1061,7 +1061,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
return duration; return duration;
} }
private void handleJobDone(JobInstance jobInstance) { @Override
public void handleJobDone(JobInstance jobInstance) {
if (Asserts.isNull(jobInstance.getTaskId())) { if (Asserts.isNull(jobInstance.getTaskId())) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment