natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix task log appender will not be closed immediate after throwing exception (#14989)

This commit is contained in:
Wenjun Ruan 2023-10-08 09:19:02 +08:00 committed by GitHub
parent c5bc535b85
commit 629fced9ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/execute/MasterTaskExecuteRunnable.java
View File

@ -55,9 +55,10 @@ public abstract class MasterTaskExecuteRunnable implements Runnable {
protected abstract void afterExecute() throws MasterTaskExecuteException; protected abstract void afterExecute() throws MasterTaskExecuteException;
protected void afterThrowing(Throwable throwable) { protected void afterThrowing(Throwable throwable) {
TaskInstanceLogHeader.printFinalizeTaskHeader();
try { try {
log.error("Get a exception when execute the task, will try to cancel the task", throwable);
cancelTask(); cancelTask();
log.error("Get a exception when execute the task, canceled the task", throwable);
} catch (Exception e) { } catch (Exception e) {
log.error("Cancel task failed,", e); log.error("Cancel task failed,", e);
} }
@ -69,6 +70,7 @@ public abstract class MasterTaskExecuteRunnable implements Runnable {
MasterTaskExecutionContextHolder.removeTaskExecutionContext(taskExecutionContext.getTaskInstanceId()); MasterTaskExecutionContextHolder.removeTaskExecutionContext(taskExecutionContext.getTaskInstanceId());
MasterTaskExecuteRunnableHolder.removeMasterTaskExecuteRunnable(taskExecutionContext.getTaskInstanceId()); MasterTaskExecuteRunnableHolder.removeMasterTaskExecuteRunnable(taskExecutionContext.getTaskInstanceId());
log.info("Get a exception when execute the task, removed the TaskExecutionContext"); log.info("Get a exception when execute the task, removed the TaskExecutionContext");
closeLogAppender();
} }
public void cancelTask() throws MasterTaskExecuteException { public void cancelTask() throws MasterTaskExecuteException {
@ -111,7 +113,6 @@ public abstract class MasterTaskExecuteRunnable implements Runnable {
} catch (Throwable ex) { } catch (Throwable ex) {
log.error("Task execute failed, due to meet an exception", ex); log.error("Task execute failed, due to meet an exception", ex);
afterThrowing(ex); afterThrowing(ex);
closeLogAppender();
} finally { } finally {
LogUtils.removeWorkflowAndTaskInstanceIdMDC(); LogUtils.removeWorkflowAndTaskInstanceIdMDC();
LogUtils.removeTaskInstanceLogFullPathMDC(); LogUtils.removeTaskInstanceLogFullPathMDC();