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

Timestamp:

07/15/14 16:26:31 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager

Files:

• resources/ClusterResourceManager.java (modified) (2 diffs)
• resources/LocalResourceManager.java (modified) (4 diffs)
• tasks/JobRegistryImpl.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ClusterResourceManager.java

@@ -1 +1 @@
 package schedframe.scheduling.manager.resources;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Node;
-import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
 import schedframe.scheduling.Scheduler;
@@ -22 +20 @@
         @SuppressWarnings("unchecked")
         public List<Node> getNodes(){
-                try {
-                        return (List<Node>) getResourcesOfType(StandardResourceType.Node);
-                } catch (ResourceException e) {
-                        return new ArrayList<Node>();
-                }
+                return (List<Node>) getResourcesOfType(StandardResourceType.Node);
         }
         
         @SuppressWarnings("unchecked")
         public List<Processor> getProcessors(){
-                try {
-                        return (List<Processor>) getResourcesOfType(StandardResourceType.Processor);
-                } catch (Exception e) {
-                        return new ArrayList<Processor>();
-                }
+                return (List<Processor>) getResourcesOfType(StandardResourceType.Processor);
         }
 

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/LocalResourceManager.java

@@ -107 +107 @@
         }
 
-        public List<? extends ComputingResource> getResourcesOfType(ResourceType type) throws ResourceException {
+        public List<? extends ComputingResource> getResourcesOfType(ResourceType type) {
                 List<ComputingResource> resourcesOfType = new ArrayList<ComputingResource>();
                 for (ComputingResource resource : computingResources) {
@@ -118 +118 @@
         }
 
-        public List<? extends ComputingResource> getResourcesByTypeWithStatus(ResourceType type, ResourceStatus status)
-                        throws ResourceException {
+        public List<? extends ComputingResource> getResourcesByTypeWithStatus(ResourceType type, ResourceStatus status){
 
                 List<ComputingResource> resourcesOfType = new ArrayList<ComputingResource>();
@@ -225 +224 @@
                 List<ComputingResource> computingResources = null;
                 if(areResourcesAchievable(StandardResourceType.Core)){
-                        try {
-                                computingResources = (List<ComputingResource>) getResourcesOfType(StandardResourceType.Core);
-                        } catch (ResourceException e) {
-                                throw new RuntimeException("DCWorms internal error");
-                        }
+
+                        computingResources = (List<ComputingResource>) getResourcesOfType(StandardResourceType.Core);
+
                         PEUnit peUnit = new ProcessingElements(computingResources);
                         peUnits = new ArrayList<ResourceUnit>();
@@ -236 +233 @@
 
                 else if(areResourcesAchievable(StandardResourceType.Processor)){
-                        try {
-                                computingResources = (List<ComputingResource>) getResourcesOfType(StandardResourceType.Processor);
-                        } catch (ResourceException e) {
-                                throw new RuntimeException("DCWorms internal error");
-                        }
+
+                        computingResources = (List<ComputingResource>) getResourcesOfType(StandardResourceType.Processor);
+
                         PEUnit peUnit = new ProcessingElements(computingResources);
                         peUnits = new ArrayList<ResourceUnit>();

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

@@ -55 +55 @@
                                         Set<String> visitedResource = task.getAllocatedResources().getLast().getResourceNames();
                                         for(String res: visitedResource){
-                                                if(res.contains(context)){
+                                                if(res.equals(context) || res.substring(0, res.lastIndexOf("/")).contains(context)){
                                                         taskList.add(task);
                                                         break;
                                                 }
                                         }
-                                        if(task.getSchedulerName().contains(context)) {
+                                        if(task.getSchedulerName().equals(context)) {
                                                 taskList.add(task);
                                         }