Changeset 1049 for DCWoRMS/trunk/src/schedframe/scheduling/manager

Timestamp:

05/23/13 22:49:27 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java (modified) (3 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -10 +10 @@
 import org.apache.commons.logging.LogFactory;
 import org.qcg.broker.schemas.resreqs.ParentType;
+import org.qcg.broker.schemas.resreqs.Workflow;
 import org.qcg.broker.schemas.resreqs.types.TaskStatesName;
 
@@ -117 +118 @@
                         if(task.getStatus() != (int)BrokerConstants.TASK_STATUS_UNSUBMITTED)
                                 continue;
-                        try{            
+                        //the following procedure supports only one nested structure
+                        Workflow w = task.getDescription().getWorkflow();
+                        if (w == null){
+                                availableTasks.add(task);
+                                continue;
+                        }
+                        if(w.getAnd() != null) {
+                                parCnt = w.getAnd().getParentOpTypeItemCount();
+                                if(parCnt == 0)
+                                {
+                                        availableTasks.add(task);
+                                }
+                                else
+                                {
+                                        for(int j = 0; j < parCnt; j++){
+                                                ParentType par = w.getAnd().getParentOpTypeItem(j).getParent();
+                                                if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
+                                                        if(!checkTaskCompletion(task.getJobId(), par.getContent())){
+                                                                break;
+                                                        }
+                                                }
+                                                previousTaskSucceedCnt++;
+                                        }
+
+                                        if(previousTaskSucceedCnt == parCnt)
+                                                availableTasks.add(task);
+                                }
+                        } 
+                        else if(w.getOr() != null) {
+                                parCnt = w.getOr().getParentOpTypeItemCount();
+                                if(parCnt == 0)
+                                {
+                                        availableTasks.add(task);
+                                }
+                                else
+                                {
+                                        for(int j = 0; j < parCnt; j++){
+                                                ParentType par = w.getOr().getParentOpTypeItem(j).getParent();
+                                                if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
+                                                        if(!checkTaskCompletion(task.getJobId(), par.getContent())){
+                                                                continue;
+                                                        }
+                                                }
+                                                previousTaskSucceedCnt++;
+                                        }
+
+                                        if(previousTaskSucceedCnt > 0)
+                                                availableTasks.add(task);
+                                }
+                        }
+                        
+                        else {
+                                parCnt = w.getParentCount();
+                                if(parCnt == 0)
+                                {
+                                        availableTasks.add(task);
+                                }
+                                else
+                                {
+                                        for(int j = 0; j < parCnt; j++){
+                                                ParentType par = w.getParent(j);
+                                                if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
+                                                        if(!checkTaskCompletion(task.getJobId(), par.getContent())){
+                                                                continue;
+                                                        }
+                                                }
+                                                previousTaskSucceedCnt++;
+                                        }
+
+                                        if(previousTaskSucceedCnt == parCnt)
+                                                availableTasks.add(task);
+                                }
+                        }
+                        
+                        /*try{          
                                 parCnt = task.getDescription().getWorkflow().getParentCount();
                         } catch(Exception e){
@@ -142 +217 @@
                                 else if (previousTaskSucceedCnt == parCnt)
                                         availableTasks.add(task);
-                        }
+                        }*/
                 }               
                 return availableTasks;