Changeset 1595 for DCWoRMS/branches

Timestamp:

11/28/16 13:11:21 (8 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -210 +210 @@
                         if(w.getAnd() != null) {
                                 parCnt = w.getAnd().getParentOpTypeItemCount();
-                                if(parCnt == 0)
-                                {
-                                        availableTasks.add(task);
-                                }
-                                else
-                                {
+                                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())){
+                                                        if(!checkTaskState(task.getJobId(), par.getContent(), TaskStatesName.FINISHED)){
+                                                        //if(!checkTaskCompletion(task.getJobId(), par.getContent())){
                                                                 break;
                                                         }
@@ -232 +230 @@
                         else if(w.getOr() != null) {
                                 parCnt = w.getOr().getParentOpTypeItemCount();
-                                if(parCnt == 0)
-                                {
-                                        availableTasks.add(task);
-                                }
-                                else
-                                {
+                                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())){
+                                                        if(!checkTaskState(task.getJobId(), par.getContent(), TaskStatesName.FINISHED)){
+                                                        //if(!checkTaskCompletion(task.getJobId(), par.getContent())){
                                                                 continue;
                                                         }
@@ -254 +250 @@
                         else {
                                 parCnt = w.getParentCount();
-                                if(parCnt == 0)
-                                {
-                                        availableTasks.add(task);
-                                }
-                                else
-                                {
+                                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(par.getContent().contains("_")){
-                                                                if(!checkTaskCompletion(par.getContent().split("_")[0], par.getContent().split("_")[1])){
+                                                                if(!checkTaskState(par.getContent().split("_")[0], par.getContent().split("_")[1], TaskStatesName.FINISHED)){
+                                                                //if(!checkTaskCompletion(par.getContent().split("_")[0], par.getContent().split("_")[1])){
                                                                         continue;
                                                                 }
-                                                        }
-                                                        else if(!checkTaskCompletion(task.getJobId(), par.getContent())){
+                                                        }                                                       
+                                                        else if(!checkTaskState(task.getJobId(), par.getContent(), TaskStatesName.FINISHED)){
+                                                        //else if(!checkTaskCompletion(task.getJobId(), par.getContent())){
                                                                 continue;
                                                         }
@@ -321 +316 @@
         }
         
+        private boolean checkTaskState(String jobID, String taskID, TaskStatesName taskState){
+                JobInterface<?> job = getJobInfo(jobID);
+                try {
+                        switch (taskState){
+                                case QUEUED:{
+                                        if(job.getTask(taskID).getStatus() == (int)BrokerConstants.JOB_STATUS_SUBMITTED)
+                                                return true;
+                                } 
+                                case FINISHED:{
+                                        if(job.getTask(taskID).isFinished())
+                                                return true;
+                                }
+                        default:
+                                break;
+                        }
+
+                } catch (NoSuchFieldException e) {
+                        //e.printStackTrace();
+                }
+                return false;
+        }
+        
         public static void reset(){
                 jobs.clear();