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

Timestamp:

06/03/14 15:12:11 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• AbstractJobRegistry.java (modified) (2 diffs)
• JobRegistry.java (modified) (3 diffs)
• JobRegistryImpl.java (modified) (3 diffs)

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

@@ -2 +2 @@
 
 
+import gridsim.dcworms.DCWormsTags;
+
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import schedframe.resources.units.ResourceUnit;
+import schedframe.resources.units.ResourceUnitName;
 import schedframe.scheduling.tasks.Job;
 import schedframe.scheduling.tasks.JobInterface;
 import schedframe.scheduling.tasks.Task;
 import schedframe.scheduling.tasks.TaskInterface;
+import simulator.DataCenterWorkloadSimulator;
+import dcworms.schedframe.scheduling.ExecTask;
 
 
 public abstract class AbstractJobRegistry /*extends ConcurrentHashMap<String, Job>*/ implements JobRegistry, Cloneable{
         
-        private static final long serialVersionUID = 8409060063583755824L;
-
         
         protected static final ConcurrentHashMap<String, JobInterface<?>> jobs = new ConcurrentHashMap<String, JobInterface<?>>();
@@ -79 +84 @@
         }
 
+        @Override
+        public boolean pauseTask(String jobId, String taskId) {
+                ExecTask execTask = getTask(jobId, taskId);
+                if (execTask == null) {
+                        return false;
+                }else{
+                        String[] ids = new String[2];
+                        ids[0] = new String(jobId);
+                        ids[1] = new String(taskId);
+                        DataCenterWorkloadSimulator.getEventManager().sendToAllSchedulers(0, DCWormsTags.TASK_PAUSE, ids);
+                        return true;
+                }
+        }
+
+        public boolean resumeTask(String jobId, String taskId) {
+                ExecTask execTask = getTask(jobId, taskId);
+                if (execTask == null) {
+                        return false;
+                }else{
+                        String[] ids = new String[2];
+                        ids[0] = new String(jobId);
+                        ids[1] = new String(taskId);
+                        DataCenterWorkloadSimulator.getEventManager().sendToAllSchedulers(0, DCWormsTags.TASK_RESUME, ids);
+                        return true;    
+                }
+        }
+
+        public boolean migrateTask(String jobId, String taskId, Map<ResourceUnitName, ResourceUnit> choosenResources) {
+                ExecTask execTask = getTask(jobId, taskId);
+                if (execTask == null) {
+                        return false;
+                }else{
+                        Object[] data = new Object[3];
+                        data[0] = new String(jobId);
+                        data[1] = new String(taskId);
+                        data[2] = choosenResources;
+                        DataCenterWorkloadSimulator.getEventManager().sendToAllSchedulers(0, DCWormsTags.TASK_MOVE, data);
+                        return true;    
+                }
+        }
+
+        public boolean migrateTask(String jobId, String taskId, String nodeName) {
+                // TODO Auto-generated method stub
+                return false;
+        }
+        
 }

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

@@ -3 +3 @@
 
 import java.util.List;
+import java.util.Map;
 
 import dcworms.schedframe.scheduling.ExecTask;
 
 import schedframe.ExecutablesList;
+import schedframe.resources.units.ResourceUnit;
+import schedframe.resources.units.ResourceUnitName;
 import schedframe.scheduling.tasks.JobInterface;
 import schedframe.scheduling.tasks.TaskInterface;
@@ -27 +30 @@
 
         
-        public List<ExecTask> getTasks(int status) ;
+        public List<ExecTask> getTasks(int status);
 
-        public List<ExecTask> getQueuedTasks() ;
+        public List<ExecTask> getQueuedTasks();
         
-        public List<ExecTask> getRunningTasks() ;
+        public List<ExecTask> getRunningTasks();
         
-        public List<ExecTask> getReadyTasks() ;
+        public List<ExecTask> getReadyTasks();
         
         public List<ExecTask> getFinishedTasks();
@@ -39 +42 @@
         
         public List<? extends TaskInterface<?>> getAvailableTasks(List<JobInterface<?>> jobsList);
+        
+        
+        public boolean pauseTask(String jobId, String taskId);
+        
+        public boolean resumeTask(String jobId, String taskId);
+        
+        public boolean migrateTask(String jobId, String taskId, Map<ResourceUnitName, ResourceUnit> choosenResources);
+        
+        public boolean migrateTask(String jobId, String taskId, String nodeName);
+        
 
 }

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

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.commons.lang.ArrayUtils;
+import java.util.Set;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -21 +21 @@
 
 public class JobRegistryImpl extends AbstractJobRegistry {
-        
-        private static final long serialVersionUID = 8030555906990767342L;
 
         private static Log log = LogFactory.getLog(JobRegistryImpl.class);
@@ -55 +53 @@
                         for (ExecTask task: executables) {
                                 if (task.getStatus() == status) {
-                                        List<String> visitedResource = task.getVisitedResources();
-                                        if(ArrayUtils.contains(visitedResource.toArray(new String[visitedResource.size()]), context)) {
+                                        Set<String> visitedResource = task.getAllocatedResources().getLast().getVisitedResources();
+                                        for(String res: visitedResource){
+                                                if(res.contains(context)){
+                                                        taskList.add(task);
+                                                        break;
+                                                }
+                                        }
+                                        if(task.getSchedulerName().contains(context)) {
                                                 taskList.add(task);
                                         }