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

[Improvement][K8S]Optimize MDC for K8S tasks (#15390) 

Signed-off-by: Gallardot <gallardot@apache.org>
Co-authored-by: fuchanghai <changhaifu@apache.org>
This commit is contained in:
Gallardot 2024-01-17 17:56:11 +08:00 committed by GitHub
parent e4de06b5af
commit c7a11ce6ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/k8s/impl/K8sTaskExecutor.java
View File

@ -205,6 +205,8 @@ public class K8sTaskExecutor extends AbstractK8sTaskExecutor {
@Override @Override
public void eventReceived(Action action, Job job) { public void eventReceived(Action action, Job job) {
try { try {
LogUtils.setWorkflowAndTaskInstanceIDMDC(taskRequest.getProcessInstanceId(),
taskRequest.getTaskInstanceId());
LogUtils.setTaskInstanceLogFullPathMDC(taskRequest.getLogPath()); LogUtils.setTaskInstanceLogFullPathMDC(taskRequest.getLogPath());
log.info("event received : job:{} action:{}", job.getMetadata().getName(), action); log.info("event received : job:{} action:{}", job.getMetadata().getName(), action);
if (action == Action.DELETED) { if (action == Action.DELETED) {
@ -222,14 +224,18 @@ public class K8sTaskExecutor extends AbstractK8sTaskExecutor {
} }
} finally { } finally {
LogUtils.removeTaskInstanceLogFullPathMDC(); LogUtils.removeTaskInstanceLogFullPathMDC();
LogUtils.removeWorkflowAndTaskInstanceIdMDC();
} }
} }
@Override @Override
public void onClose(WatcherException e) { public void onClose(WatcherException e) {
LogUtils.setWorkflowAndTaskInstanceIDMDC(taskRequest.getProcessInstanceId(),
taskRequest.getTaskInstanceId());
log.error("[K8sJobExecutor-{}] fail in k8s: {}", job.getMetadata().getName(), e.getMessage()); log.error("[K8sJobExecutor-{}] fail in k8s: {}", job.getMetadata().getName(), e.getMessage());
taskResponse.setExitStatusCode(EXIT_CODE_FAILURE); taskResponse.setExitStatusCode(EXIT_CODE_FAILURE);
countDownLatch.countDown(); countDownLatch.countDown();
LogUtils.removeWorkflowAndTaskInstanceIdMDC();
} }
}; };
try (Watch watch = k8sUtils.createBatchJobWatcher(job.getMetadata().getName(), watcher)) { try (Watch watch = k8sUtils.createBatchJobWatcher(job.getMetadata().getName(), watcher)) {
@ -260,10 +266,12 @@ public class K8sTaskExecutor extends AbstractK8sTaskExecutor {
String containerName = String.format("%s-%s", taskName, taskInstanceId); String containerName = String.format("%s-%s", taskName, taskInstanceId);
podLogOutputFuture = collectPodLogExecutorService.submit(() -> { podLogOutputFuture = collectPodLogExecutorService.submit(() -> {
TaskOutputParameterParser taskOutputParameterParser = new TaskOutputParameterParser(); TaskOutputParameterParser taskOutputParameterParser = new TaskOutputParameterParser();
LogUtils.setWorkflowAndTaskInstanceIDMDC(taskRequest.getProcessInstanceId(),
taskRequest.getTaskInstanceId());
LogUtils.setTaskInstanceLogFullPathMDC(taskRequest.getLogPath());
try ( try (
LogWatch watcher = ProcessUtils.getPodLogWatcher(taskRequest.getK8sTaskExecutionContext(), LogWatch watcher = ProcessUtils.getPodLogWatcher(taskRequest.getK8sTaskExecutionContext(),
taskRequest.getTaskAppId(), containerName)) { taskRequest.getTaskAppId(), containerName)) {
LogUtils.setTaskInstanceLogFullPathMDC(taskRequest.getLogPath());
String line; String line;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(watcher.getOutput()))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(watcher.getOutput()))) {
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {