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

Timestamp:

06/05/14 15:24:38 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• resources/LocalResourceManager.java (modified) (2 diffs)
• resources/ResourceManager.java (modified) (1 diff)
• tasks/AbstractJobRegistry.java (modified) (5 diffs)

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

@@ -134 +134 @@
         }
 
-        public ComputingResource getResourceByName(String resourceName) throws ResourceException {
+        public ComputingResource getResourceByName(String resourceName) {
                 ComputingResource resourceWithName = null;
                 for (int i = 0; i < computingResources.size() && resourceWithName == null; i++) {
@@ -269 +269 @@
                                 resourceWithName = resource;
                         else
-                                try {
-                                        resourceWithName = resource.getDescendantByName(resName);
-                                } catch (ResourceException e) {
-                                        return null;
-                                }
+                                resourceWithName = resource.getDescendantByName(resName);
+
                 }
                 if(resourceWithName == null)

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

@@ -19 +19 @@
         public List<? extends ComputingResource> getResourcesOfType(ResourceType type) throws ResourceException;
 
-        public ComputingResource getResourceByName(String resourceName) throws ResourceException;
+        public ComputingResource getResourceByName(String resourceName);
 
         public List<? extends ComputingResource> getResourcesByTypeWithStatus(ResourceType type, ResourceStatus status) throws ResourceException;

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

@@ -11 +11 @@
 import schedframe.resources.units.ResourceUnit;
 import schedframe.resources.units.ResourceUnitName;
+import schedframe.scheduling.manager.resources.utils.ResourceManagerUtils;
 import schedframe.scheduling.tasks.Job;
 import schedframe.scheduling.tasks.JobInterface;
@@ -65 +66 @@
         public List<JobInterface<?>> getJobs(){
                 List<JobInterface<?>> jobList = new ArrayList<JobInterface<?>>();
-                for(String jobId:jobs.keySet()) {
+                for(String jobId: jobs.keySet()) {
                         jobList.add(jobs.get(jobId));
                 }
@@ -74 +75 @@
                 List<JobInterface<?>> jobList = new ArrayList<JobInterface<?>>();
                 synchronized (jobs) {
-                        for(String jobId:jobs.keySet()){
+                        for(String jobId: jobs.keySet()){
                                 JobInterface<?> job = jobs.get(jobId);
                                 if (job.getStatus() == status) {
@@ -90 +91 @@
                         return false;
                 }else{
+                        try {
+                                execTask.setStatus(DCWormsTags.PAUSING);
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
                         String[] ids = new String[2];
                         ids[0] = new String(jobId);
@@ -116 +123 @@
                         return false;
                 }else{
+                        try {
+                                execTask.setStatus(DCWormsTags.IN_MIGRATION);
+                        } catch (Exception e) {
+                                return false;
+                        }
+                        if(choosenResources != null){
+                                ResourceManagerUtils.setPendingResources(choosenResources);
+                        }
                         Object[] data = new Object[3];
                         data[0] = new String(jobId);