Changeset 1434 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager

Timestamp:

09/15/14 17:00:03 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -7 +7 @@
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-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;
 
-import dcworms.schedframe.scheduling.ExecTask;
-
 import qcg.shared.constants.BrokerConstants;
 import schedframe.ExecutablesList;
+import schedframe.resources.computing.ComputingResource;
 import schedframe.scheduling.tasks.JobInterface;
 import schedframe.scheduling.tasks.Task;
+import dcworms.schedframe.scheduling.ExecTask;
 
 public class JobRegistryImpl extends AbstractJobRegistry {
 
-        private static Log log = LogFactory.getLog(JobRegistryImpl.class);
-
         private String context;
-
+        private ComputingResource cr;
         //TO DO - consider data structure
         protected static final ExecutablesList executables = new ExecutablesList();
+
         //protected static final List<ExecTask> executables = Collections.synchronizedList(new ArrayList<ExecTask>());;
         //protected static final List<ExecTaskInterface> executables = new CopyOnWriteArrayList<ExecTaskInterface>();
@@ -34 +31 @@
                 this.context = context;
         }
-
+        
+        public JobRegistryImpl(ComputingResource cr) {
+                this.cr = cr;
+        }
+
+        public JobRegistryImpl() {
+                this("");
+        }
+        
         public boolean addExecTask(ExecTask newTask) {
                 if(getTask(newTask.getJobId(), newTask.getId()) == null) {
-                        synchronized (executables)  {
+                        synchronized (executables) {
                                 executables.add(newTask);
                         }
@@ -53 +58 @@
                         for (ExecTask task: executables) {
                                 if (task.getStatus() == status) {
-                                        Set<String> visitedResource = task.getAllocatedResources().getLast().getResourceNames();
-                                        for(String res: visitedResource){
-                                                if(res.equals(context) || res.substring(0, res.lastIndexOf("/")).contains(context)){
+                                        if(cr != null){
+                                                Set<ComputingResource> visitedResource = task.getAllocatedResources().getLast().getResources();
+                                                if(visitedResource.contains(cr)){
                                                         taskList.add(task);
-                                                        break;
-                                                }
-                                        }
-                                        if(task.getSchedulerName().equals(context)) {
-                                                taskList.add(task);
-                                        }
-                                }
-                        }
-                }
+                                                } else {
+                                                        for(ComputingResource res: visitedResource){
+                                                                if(cr.contains(res)){
+                                                                        taskList.add(task);
+                                                                        break;
+                                                                }
+                                                        }
+                                                }
+                                        } else {
+                                                Set<String> visitedResource = task.getAllocatedResources().getLast().getResourceNames();
+                                                for(String res: visitedResource){
+                                                        if(res.equals(context) || res.substring(0, res.lastIndexOf("/")).contains(context)){
+                                                                taskList.add(task);
+                                                                break;
+                                                        }
+                                                }
+
+                                                if(task.getSchedulerName().equals(context)) {
+                                                        taskList.add(task);
+                                                }
+                                        }
+                                }
+                        }
+                }
+
                 return taskList;
         }