Changeset 9123 for trunk/sources/HeuristicLab.Services.Hive/3.3/Scheduler

Timestamp:

01/07/13 22:00:04 (12 years ago)

Author:

ascheibe

Message:

#1712 reintegrated Hive Scheduler branch and made further performance improvements

Location:

trunk/sources/HeuristicLab.Services.Hive

Files:

• . (modified) (1 prop)
• 3.3/Scheduler (copied) (copied from branches/HiveTaskScheduler/HeuristicLab.Services.Hive/3.3/Scheduler)
• 3.3/Scheduler/JobInfoForScheduler.cs (added)
• 3.3/Scheduler/RoundRobinTaskScheduler.cs (modified) (4 diffs)
• 3.3/Scheduler/TaskInfoForScheduler.cs (added)

trunk/sources/HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs

@@ -31 +31 @@
     }
 
-    public IEnumerable<Task> Schedule(IEnumerable<Task> tasks, int count = 1) {
-      if (!tasks.Any()) return Enumerable.Empty<Task>();
+    public IEnumerable<TaskInfoForScheduler> Schedule(IEnumerable<TaskInfoForScheduler> tasks, int count = 1) {
+      if (!tasks.Any()) return Enumerable.Empty<TaskInfoForScheduler>();
 
       var userPriorities = dao.GetUserPriorities(x => true).OrderBy(x => x.DateEnqueued).ToArray();
 
-      var jobs = new List<Job>();
+      var jobs = new List<JobInfoForScheduler>();
       foreach (var userPriority in userPriorities) {
-        jobs.AddRange(dao.GetJobs(x => x.OwnerUserId == userPriority.Id));
+        jobs.AddRange(dao.GetJobInfoForScheduler(x => x.OwnerUserId == userPriority.Id));
       }
 
@@ -44 +44 @@
         task => task.JobId,
         job => job.Id,
-        (task, job) => new { Task = task, Job = job })
+        (task, job) => new { Task = task, JobInfo = job })
         .OrderByDescending(x => x.Task.Priority)
         .ToList();
 
-      var scheduledTasks = new List<Task>();
+      var scheduledTasks = new List<TaskInfoForScheduler>();
       int priorityIndex = 0;
 
@@ -55 +55 @@
       for (int i = 0; i < count; i++) {
         var defaultEntry = taskJobRelations.First(); // search first task which is not included yet
-        var priorityEntries = taskJobRelations.Where(x => x.Job.OwnerUserId == userPriorities[priorityIndex].Id).ToArray(); // search for tasks with desired user priority
-        while (!priorityEntries.Any() && ++priorityIndex < userPriorities.Length)
-          priorityEntries = taskJobRelations.Where(x => x.Job.OwnerUserId == userPriorities[priorityIndex].Id).ToArray();
+        var priorityEntries = taskJobRelations.Where(x => x.JobInfo.OwnerUserId == userPriorities[priorityIndex].Id).ToArray(); // search for tasks with desired user priority
+        while (!priorityEntries.Any() && priorityIndex < userPriorities.Length - 1) {
+          priorityIndex++;
+          priorityEntries = taskJobRelations.Where(x => x.JobInfo.OwnerUserId == userPriorities[priorityIndex].Id).ToArray();
+        }
         if (priorityEntries.Any()) { // tasks with desired user priority found
-          var priorityEntry = priorityEntries.OrderByDescending(x => x.Task.Priority).ThenBy(x => x.Job.DateCreated).First();
+          var priorityEntry = priorityEntries.OrderByDescending(x => x.Task.Priority).ThenBy(x => x.JobInfo.DateCreated).First();
           if (defaultEntry.Task.Priority <= priorityEntry.Task.Priority) {
             taskJobRelations.Remove(priorityEntry);
             scheduledTasks.Add(priorityEntry.Task);
+            UpdateUserPriority(userPriorities[priorityIndex]);
             priorityIndex++;
           } else { // there are other tasks with higher priorities
@@ -72 +75 @@
           scheduledTasks.Add(defaultEntry.Task);
         }
+
+        if (priorityIndex >= (userPriorities.Length - 1)) priorityIndex = 0;
       }
-
-      // requeue user priorities
-      if (priorityIndex < userPriorities.Length)
-        for (int i = 0; i < priorityIndex; i++) {
-          userPriorities[i].DateEnqueued = DateTime.Now;
-          dao.EnqueueUserPriority(userPriorities[i]);
-        }
 
       return scheduledTasks;
     }
+
+    private void UpdateUserPriority(UserPriority up) {
+      up.DateEnqueued = DateTime.Now;
+      dao.EnqueueUserPriority(up);
+    }
   }
 }