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

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

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

Files:

• global/GlobalManagementSystem.java (modified) (1 diff)
• local/LocalManagementSystem.java (modified) (26 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/global/GlobalManagementSystem.java

@@ -78 +78 @@
                         return;
                 }
-                
                 registerWorkloadUnit(wu);
 

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

@@ -19 +19 @@
 import schedframe.events.scheduling.StartTaskExecutionEvent;
 import schedframe.events.scheduling.TaskFinishedEvent;
+import schedframe.events.scheduling.TaskPausedEvent;
 import schedframe.events.scheduling.TaskRequestedTimeExpiredEvent;
+import schedframe.events.scheduling.TaskResumedEvent;
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.units.PEUnit;
 import schedframe.resources.units.ProcessingElements;
@@ -163 +165 @@
                         String[] ids = (String[]) ev.get_data();
                         execTask = jobRegistry.getTask(ids[0], ids[1]);
-                        taskPause(execTask);
+                        pauseTask(execTask);
                         if (pluginSupportsEvent(tag)) {
-                                SchedulingEvent event = new SchedulingEvent(SchedulingEventType.TASK_PAUSED);
+                                SchedulingEvent event = new TaskPausedEvent(ids[0], ids[1]);
                                 SchedulingPlanInterface<?> decision = schedulingPlugin.schedule(event,
                                                 queues, jobRegistry, getResourceManager(), moduleList);
@@ -176 +178 @@
                         String[] ids = (String[]) ev.get_data();
                         execTask = jobRegistry.getTask(ids[0], ids[1]);
-                        taskResume(execTask, execTask.getAllocatedResources().getLast().getResourceUnits(), true);
+                        resumeTask(execTask, execTask.getAllocatedResources().getLast().getResourceUnits(), true);
                         if (pluginSupportsEvent(tag)) {
-                                SchedulingEvent event = new StartTaskExecutionEvent(ids[0], ids[1]);
+                                SchedulingEvent event = new TaskResumedEvent(ids[0], ids[1]);
                                 SchedulingPlanInterface<?> decision = schedulingPlugin.schedule(event,
                                                 queues, jobRegistry, getResourceManager(), moduleList);
@@ -189 +191 @@
                         Object[] data = (Object[]) ev.get_data();
                         execTask = jobRegistry.getTask((String)data[0], (String)data[1]);
-                        double migrationTime = execTimeEstimationPlugin.estimateMigrationTime(new StartTaskExecutionEvent((String)data[0], (String)data[1]), execTask, execTask.getAllocatedResources().getLast().getResourceUnits(), (Map<ResourceUnitName, ResourceUnit>)data[2]);
+                        double migrationTime = execTimeEstimationPlugin.estimateMigrationTime(new StartTaskExecutionEvent((String)data[0], 
+                                        (String)data[1]), execTask, execTask.getAllocatedResources().getLast().getResourceUnits(), (Map<ResourceUnitName, ResourceUnit>)data[2]);
                         scheduler.sendInternal(migrationTime, DCWormsTags.TASK_MOVE, data);
                 }
@@ -197 +200 @@
                         Object[] data = (Object[]) ev.get_data();
                         execTask = jobRegistry.getTask((String)data[0], (String)data[1]);
-                        taskMove(execTask, (Map<ResourceUnitName, ResourceUnit>)data[2]);
+                        moveTask(execTask, (Map<ResourceUnitName, ResourceUnit>)data[2]);
                         if (pluginSupportsEvent(tag)) {
                                 SchedulingEvent event = new StartTaskExecutionEvent((String)data[0], (String)data[1]);
@@ -209 +212 @@
                 case DCWormsTags.TASK_EXECUTION_CHANGED:
                         execTask = (ExecTask) ev.get_data();
-                        updateTaskExecutionPhase(execTask, SchedulingEventType.RESOURCE_STATE_CHANGED);
+                        updateTaskExecutionPhase(execTask);
                         break;
 
@@ -231 +234 @@
                         }
                         break;
-                }
-        }
-
-
-        public void taskPause(ExecTask execTask) {
+                default:                
+                        
+                        break;
+                }
+        }
+
+
+        protected void pauseTask(ExecTask execTask) {
                 if (execTask == null) {
                         return;
@@ -246 +252 @@
                                 getAllocationManager().freeResources(lastUsed, true);
                                 
-                                saveExecutionHistory(exec, exec.getCompletionPercentage(), exec.getEstimatedDuration());
+                                saveExecutionHistory(exec, exec.getExecutionProfile().getCompletionPercentage(), exec.getEstimatedDuration());
                                 
                                 ExecTaskFilter filter = new ExecTaskFilter(exec.getUniqueId(), -1);
@@ -252 +258 @@
                                 
                                 PEUnit peUnit = (PEUnit)lastUsed.get(StandardResourceUnitName.PE);
-                                updateComputingResources(peUnit, EnergyEventType.TASK_FINISHED, exec);
+                                updateComputingResources(peUnit, ResourceEventType.TASK_FINISHED, exec);
                         } catch (Exception e) {
                                 // TODO Auto-generated catch block
@@ -260 +266 @@
         }
         
-        public void taskResume(ExecTask execTask, Map<ResourceUnitName, ResourceUnit> resources, boolean exclusive) {
+        protected void resumeTask(ExecTask execTask, Map<ResourceUnitName, ResourceUnit> resources, boolean exclusive) {
                 if (execTask == null) {
                         return;
@@ -278 +284 @@
                                         
                                         PEUnit peUnit = (PEUnit)resources.get(StandardResourceUnitName.PE);
-                                        updateComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
+                                        updateComputingResources(peUnit, ResourceEventType.TASK_STARTED, exec);
                                 }
 
@@ -288 +294 @@
         }
         
-        public void taskMove(ExecTask execTask, Map<ResourceUnitName, ResourceUnit> map) {
-                taskPause(execTask);
-                taskResume(execTask, map, false);
+        protected void moveTask(ExecTask execTask, Map<ResourceUnitName, ResourceUnit> map) {
+                pauseTask(execTask);
+                resumeTask(execTask, map, false);
         }
         
@@ -351 +357 @@
                 
                 PEUnit peUnit = (PEUnit)choosenResources.get(StandardResourceUnitName.PE);
-                updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                updateComputingResources(peUnit, ResourceEventType.UTILIZATION_CHANGED, exec);
                 
 
@@ -377 +383 @@
 
                 int phaseDuration = Double.valueOf(execTimeEstimationPlugin.execTimeEstimation(new SchedulingEvent(SchedulingEventType.START_TASK_EXECUTION), 
-                                execTask, resources, exec.getCompletionPercentage())).intValue();
-
-                saveExecutionHistory(exec, exec.getCompletionPercentage(), phaseDuration);
+                                execTask, resources, exec.getExecutionProfile().getCompletionPercentage())).intValue();
+
+                saveExecutionHistory(exec, exec.getExecutionProfile().getCompletionPercentage(), phaseDuration);
                 if(exec.getExecutionProfile().isLast()){
                         scheduler.sendInternal(phaseDuration, DCWormsTags.TASK_EXECUTION_FINISHED, execTask);;
@@ -387 +393 @@
                 
                 PEUnit peUnit = (PEUnit)resources.get(StandardResourceUnitName.PE);
-                updateComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
+                updateComputingResources(peUnit, ResourceEventType.TASK_STARTED, exec);
                 
         }
@@ -429 +435 @@
                 
                 PEUnit peUnit = (PEUnit)lastUsed.get(StandardResourceUnitName.PE);
-                updateComputingResources(peUnit, EnergyEventType.TASK_FINISHED, exec);
+                updateComputingResources(peUnit, ResourceEventType.TASK_FINISHED, exec);
                 
                 log.debug(execTask.getJobId() + "_" + execTask.getId() + " finished execution on " + new DateTime());
                 log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad());
                 
-                updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                updateComputingResources(peUnit, ResourceEventType.UTILIZATION_CHANGED, exec);
         }
         
@@ -452 +458 @@
                         //System.out.println("--- upadteProgressX: " + Sim_system.sim_clock() );
                         //System.out.println("taskId: " + exec.getId() + "; completion percentage: " + exec.getCompletionPercentage() + "; timespan: " + timeSpan + "; estimatedDuration: " +  execHistItem.getCompletionPercentage());
-                        exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / (execHistItem.getEstimatedDuration()) * (1.0 - execHistItem.getCompletionPercentage()/100.0)));
+                        exec.getExecutionProfile().setCompletionPercentage(exec.getExecutionProfile().getCompletionPercentage() + 100 * (timeSpan / (execHistItem.getEstimatedDuration()) * (1.0 - execHistItem.getCompletionPercentage()/100.0)));
+                        exec.setTotalCompletionPercentage(exec.getTotalCompletionPercentage() + 100 * (timeSpan / execHistItem.getEstimatedDuration()) * exec.getExecutionProfile().getCurrentResourceConsumption().getLenght() / exec.getExecutionProfile().getLength());
                         //System.out.println("newProgress: " + exec.getCompletionPercentage()  );       
 
@@ -458 +465 @@
         }
         
-        private void updateComputingResources(PEUnit peUnit, EnergyEventType eventType, Object obj){
+        private void updateComputingResources(PEUnit peUnit, ResourceEventType eventType, Object obj){
                 if(peUnit instanceof ProcessingElements){
                         ProcessingElements pes = (ProcessingElements) peUnit;
                         for (ComputingResource resource : pes) {
-                                resource.handleEvent(new EnergyEvent(eventType, obj, scheduler.getFullName()));
+                                resource.handleEvent(new ResourceEvent(eventType, obj, scheduler.getFullName()));
                                 //DataCenterWorkloadSimulator.getEventManager().sendToResources(resource.getType(), 0, new EnergyEvent(eventType, obj));
                         }
@@ -480 +487 @@
                                 return;
                         }
-                        resource.handleEvent(new EnergyEvent(eventType, obj, scheduler.getFullName()));
+                        resource.handleEvent(new ResourceEvent(eventType, obj, scheduler.getFullName()));
                 }
         }
@@ -492 +499 @@
 
                         int phaseDuration = Double.valueOf(execTimeEstimationPlugin.execTimeEstimation(new SchedulingEvent(SchedulingEventType.RESOURCE_STATE_CHANGED), 
-                                        execTask, choosenResources, exec.getCompletionPercentage())).intValue();
+                                        execTask, choosenResources, exec.getExecutionProfile().getCompletionPercentage())).intValue();
 
                         ExecutionHistoryItem execHistItem = exec.getExecutionHistory().getLast();
-                        double lastTimeStamp = execHistItem.getTimeStamp().getMillis()/1000;
-                        if(DoubleMath.subtract((lastTimeStamp + execHistItem.getEstimatedDuration()), (new DateTime().getMillis()/1000 + phaseDuration)) == 0.0){
+                        double lastTimeStamp = execHistItem.getTimeStamp().getMillis() / 1000;
+                        if(DoubleMath.subtract((lastTimeStamp + execHistItem.getEstimatedDuration()), (new DateTime().getMillis() / 1000 + phaseDuration)) == 0.0){
                                 continue;
                         }
@@ -504 +511 @@
                         //System.out.println("completionPercantage: " + exec.getCompletionPercentage() + "; basic duration: " +exec.getResourceConsumptionProfile().getCurrentResourceConsumption().getDuration() +   "; phaseDuration: " +  phaseDuration);
 
-                        saveExecutionHistory(exec, exec.getCompletionPercentage(), phaseDuration);
+                        saveExecutionHistory(exec, exec.getExecutionProfile().getCompletionPercentage(), phaseDuration);
                         
                         if(exec.getExecutionProfile().isLast()){
@@ -522 +529 @@
         }       
 
-        protected void updateTaskExecutionPhase(ExecTask execTask, SchedulingEventType schedEvType) {
+        protected void updateTaskExecutionPhase(ExecTask execTask) {
 
                 if (execTask.getStatus() == DCWormsTags.INEXEC) {
@@ -535 +542 @@
                         Map<ResourceUnitName, ResourceUnit> choosenResources = exec.getAllocatedResources().getLast().getResourceUnits();
 
-                        int phaseDuration = Double.valueOf(execTimeEstimationPlugin.execTimeEstimation(new SchedulingEvent(schedEvType), 
-                                        execTask, choosenResources, exec.getCompletionPercentage())).intValue();
-                        
-                        saveExecutionHistory(exec, exec.getCompletionPercentage(), phaseDuration);
+                        int phaseDuration = Double.valueOf(execTimeEstimationPlugin.execTimeEstimation(new SchedulingEvent(SchedulingEventType.TASK_EXECUTION_CHANGED), 
+                                        execTask, choosenResources, exec.getExecutionProfile().getCompletionPercentage())).intValue();
+                        
+                        saveExecutionHistory(exec, exec.getExecutionProfile().getCompletionPercentage(), phaseDuration);
                         
                         if(exec.getExecutionProfile().isLast()){
@@ -547 +554 @@
                         
                         PEUnit peUnit = (PEUnit)exec.getAllocatedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                        updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                        updateComputingResources(peUnit, ResourceEventType.UTILIZATION_CHANGED, exec);
                 }
         }       
 
-        public double calculateTotalLoad() {
+        protected double calculateTotalLoad() {
 
                 DCwormsAccumulator loadAcc = new DCwormsAccumulator();
-                try {
-                        for(ComputingResource compRes: getResourceManager().getResourcesOfType(StandardResourceType.Node)){
-                                loadAcc.add(compRes.getLoadInterface().getRecentUtilization().getValue());                              
-                        }
-                } catch (ResourceException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-                
+
+                for(ComputingResource compRes: getResourceManager().getResourcesOfType(StandardResourceType.Node)){
+                        loadAcc.add(compRes.getLoadInterface().getRecentUtilization().getValue());                              
+                }
+
                 return loadAcc.getMean();
         }
@@ -703 +706 @@
         
         private void saveExecutionHistory(Executable exec, double completionPercentage, double estimatedDuration){
-
                 ExecutionHistoryItem execHistoryItem = new ExecutionHistoryItem(new DateTime());
                 execHistoryItem.setCompletionPercentage(completionPercentage);
@@ -710 +712 @@
                 execHistoryItem.setStatus(exec.getStatus());
                 exec.addExecHistory(execHistoryItem);
-                
         }