Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Improvement-10279] [Master] Dependent node log output optimization and fix checkstyle #10593

Merged
merged 1 commit into from
Jun 24, 2022
Merged

[Improvement-10279] [Master] Dependent node log output optimization and fix checkstyle #10593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...in/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@

package org.apache.dolphinscheduler.server.master.runner.task;

import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT;
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_DEPENDENT;

import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy;
import org.apache.dolphinscheduler.common.utils.NetUtils;
import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult;
import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy;
import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel;
import org.apache.dolphinscheduler.plugin.task.api.parameters.DependentParameters;
import org.apache.dolphinscheduler.plugin.task.api.utils.DependentUtils;
Expand Down Expand Up @@ -116,8 +115,8 @@ protected boolean taskTimeout() {
&& TaskTimeoutStrategy.WARNFAILED != taskTimeoutStrategy) {
return true;
}
logger.info("dependent task {} timeout, strategy {} ",
taskInstance.getId(), taskTimeoutStrategy.getDescp());
logger.info("dependent taskInstanceId: {} timeout, taskName: {}, strategy: {} ",
taskInstance.getId(), taskInstance.getName(), taskTimeoutStrategy.getDescp());
result = DependResult.FAILED;
endTask();
return true;
Expand Down Expand Up @@ -166,7 +165,7 @@ private boolean allDependentTaskFinish() {
if (!dependResultMap.containsKey(entry.getKey())) {
dependResultMap.put(entry.getKey(), entry.getValue());
//save depend result to log
logger.info("dependent item complete {} {},{}", DEPENDENT_SPLIT, entry.getKey(), entry.getValue());
logger.info("dependent item complete, task: {}, result: {}", entry.getKey(), entry.getValue());
}
}
if (!dependentExecute.finish(dependentDate)) {
Expand All @@ -188,7 +187,7 @@ private DependResult getTaskDependResult() {
dependResultList.add(dependResult);
}
result = DependentUtils.getDependResultForRelation(this.dependentParameters.getRelation(), dependResultList);
logger.info("dependent task completed, dependent result:{}", result);
logger.info("dependent task completed, dependent result: {}", result);
return result;
}

Expand Down