Changeset 1377 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy

Timestamp:

06/06/14 10:48:32 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy

Files:

• AbstractManagementSystem.java (modified) (1 diff)
• local/LocalManagementSystem.java (modified) (5 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -26 +26 @@
 import schedframe.scheduling.plugin.estimation.ExecutionTimeEstimationPlugin;
 import schedframe.scheduling.plugin.grid.ModuleList;
-import schedframe.scheduling.plugin.local.ResourceAllocation;
+import schedframe.scheduling.manager.resources.ResourceAllocation;
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -238 +238 @@
                                 Executable exec = (Executable) execTask;
                                 Map<ResourceUnitName, ResourceUnit> lastUsed = exec.getAllocatedResources().getLast().getResourceUnits();
-                                getAllocationManager().freeResources(lastUsed);
+                                getAllocationManager().freeResources(lastUsed, true);
                                 
                                 saveExecutionHistory(exec, exec.getCompletionPercentage(), exec.getEstimatedDuration());
@@ -262 +262 @@
                                 Executable exec = (Executable) execTask;
 
-                                boolean status = allocateResources(exec, resources);
+                                boolean status = allocateResources(exec, resources, true);
                                 if(status == false){
                                         TaskList newTasks = new TaskListImpl();
@@ -332 +332 @@
 
                 Executable exec = (Executable)task;
-                boolean allocationStatus = allocateResources(exec, choosenResources);
+                boolean allocationStatus = allocateResources(exec, choosenResources, false);
                 if(allocationStatus == false){
                         log.info("Task " + task.getJobId() + "_" + task.getId() + " requires more resources than is available at this moment.");
@@ -417 +417 @@
 
                 Map<ResourceUnitName, ResourceUnit> lastUsed = exec.getAllocatedResources().getLast().getResourceUnits();
-                getAllocationManager().freeResources(lastUsed);
+                getAllocationManager().freeResources(lastUsed, true);
                 
                 //TODO calculate the value of completion
@@ -727 +727 @@
         }
         
-        public boolean allocateResources(Executable exec, Map<ResourceUnitName, ResourceUnit> choosenResources){
-                boolean allocationStatus = getAllocationManager().allocateResources(choosenResources);
+        public boolean allocateResources(Executable exec, Map<ResourceUnitName, ResourceUnit> choosenResources, boolean exclusive){
+                boolean allocationStatus = getAllocationManager().allocateResources(choosenResources, exclusive);
                 if(allocationStatus){
                         ResourceHistoryItem resourceHistoryItem = new ResourceHistoryItem(choosenResources);