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 {
&& Duration.between(jobInstance.getFinishTime(), LocalDateTime.now()).toMinutes() < 1)) {
DefaultThreadPool.getInstance().execute(this);
} else {
taskService.handleJobDone(jobInstance);
FlinkJobTaskPool.getInstance().remove(config.getId().toString());
}
}
......
......@@ -42,7 +42,7 @@ public class SecurityAspect {
// 敏感信息的pattern :
// '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'='******'";
......@@ -67,7 +67,7 @@ public class SecurityAspect {
// /api/studio/explainSql
if (returnValue instanceof Result<?> && ((Result<?>) returnValue).getDatas() instanceof List<?>) {
List<?> list = (List<?>) ((Result<?>) returnValue).getDatas();
if (list.isEmpty() || !(list.get(0) instanceof SqlExplainResult)) {
if (list.isEmpty() || !(list.get(0) instanceof SqlExplainResult)) {
return;
}
List<SqlExplainResult> exp = ((List<SqlExplainResult>) ((Result<?>) returnValue).getDatas());
......@@ -117,9 +117,9 @@ public class SecurityAspect {
/**
* 将info中的敏感信息中打码
*
* @param info 包含敏感信息的字符串
* @param passwordPattern 敏感信息的regex
* @param mask 屏蔽码
* @param info 包含敏感信息的字符串
* @param passwordPattern 敏感信息的regex
* @param mask 屏蔽码
* @return
*/
public static String mask(String info, String passwordPattern, String mask) {
......
......@@ -97,10 +97,12 @@ public interface TaskService extends ISuperService<Task> {
Result uploadTaskJson(MultipartFile file) throws Exception;
void handleJobDone(JobInstance jobInstance);
Result queryAllCatalogue();
Result<List<Task>> queryOnLineTaskByDoneStatus(List<JobLifeCycle> jobLifeCycle
, List<JobStatus> jobStatuses, boolean includeNull, Integer catalogueId);
, List<JobStatus> jobStatuses, boolean includeNull, Integer catalogueId);
void selectSavepointOnLineTask(TaskOperatingResult taskOperatingResult);
......
......@@ -809,7 +809,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
if (JobStatus.isDone(jobInfoDetail.getInstance().getStatus()) && !status.equals(jobInfoDetail.getInstance().getStatus())) {
jobStatusChanged = true;
jobInfoDetail.getInstance().setFinishTime(LocalDateTime.now());
handleJobDone(jobInfoDetail.getInstance());
// handleJobDone(jobInfoDetail.getInstance());
}
if (isCoercive) {
DaemonFactory.addTask(DaemonTaskConfig.build(FlinkJobTask.TYPE, jobInfoDetail.getInstance().getId()));
......@@ -1061,7 +1061,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
return duration;
}
private void handleJobDone(JobInstance jobInstance) {
@Override
public void handleJobDone(JobInstance jobInstance) {
if (Asserts.isNull(jobInstance.getTaskId())) {
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