You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2020/12/15 10:41:04 UTC
[GitHub] [incubator-dolphinscheduler] CalvinKirs commented on a change in pull request #4232: [Fix#4222][Master]Add the priority queue to ensure that tasks are submitted according to priority.
CalvinKirs commented on a change in pull request #4232:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/4232#discussion_r543233526
##########
File path: dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
##########
@@ -996,20 +1002,26 @@ private boolean retryTaskIntervalOverTime(TaskInstance taskInstance){
* handling the list of tasks to be submitted
*/
private void submitStandByTask(){
- for(Map.Entry<String, TaskInstance> entry: readyToSubmitTaskList.entrySet()) {
- TaskInstance task = entry.getValue();
- DependResult dependResult = getDependResultForTask(task);
- if(DependResult.SUCCESS == dependResult){
- if(retryTaskIntervalOverTime(task)){
- submitTaskExec(task);
+
+ try {
+ int length = readyToSubmitTaskQueue.size();
+ for (int i=0;i<length;i++) {
+ TaskInstance task = readyToSubmitTaskQueue.peek();
+ DependResult dependResult = getDependResultForTask(task);
+ if(DependResult.SUCCESS == dependResult){
+ if(retryTaskIntervalOverTime(task)){
+ submitTaskExec(task);
+ removeTaskFromStandbyList(task);
+ }
+ }else if(DependResult.FAILED == dependResult){
+ // if the dependency fails, the current node is not submitted and the state changes to failure.
+ dependFailedTask.put(task.getName(), task);
removeTaskFromStandbyList(task);
+ logger.info("task {},id:{} depend result : {}",task.getName(), task.getId(), dependResult);
}
- }else if(DependResult.FAILED == dependResult){
- // if the dependency fails, the current node is not submitted and the state changes to failure.
- dependFailedTask.put(entry.getKey(), task);
- removeTaskFromStandbyList(task);
- logger.info("task {},id:{} depend result : {}",task.getName(), task.getId(), dependResult);
}
+ } catch (Exception e) {
+ e.printStackTrace();
Review comment:
Should use logger.error...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org