Changeset 12858 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/NewRoundRobinTaskScheduler.cs

Timestamp:

08/13/15 15:22:51 (9 years ago)

Author:

ascheibe

Message:

#2388

• prevent disposing of hive data context
• more cleanups

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/NewRoundRobinTaskScheduler.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Scheduler/NewRoundRobinTaskScheduler.cs

@@ -35 +35 @@
       if (!tasks.Any()) return Enumerable.Empty<TaskInfoForScheduler>();
 
-      using (var pm = PersistenceManager) {
-        var userPriorityDao = pm.UserPriorityDao;
-        var jobDao = pm.JobDao;
+      var pm = PersistenceManager;
+      var userPriorityDao = pm.UserPriorityDao;
+      var jobDao = pm.JobDao;
 
-        var userPriorities = pm.UseTransaction(() => userPriorityDao.GetAll()
-          .OrderBy(x => x.DateEnqueued)
-          .ToArray()
-        );
+      var userPriorities = pm.UseTransaction(() => userPriorityDao.GetAll()
+        .OrderBy(x => x.DateEnqueued)
+        .ToArray()
+      );
 
-        var userIds = userPriorities.Select(x => x.UserId).ToList();
-        var jobs = pm.UseTransaction(() => {
-          return jobDao.GetAll()
-            .Where(x => userIds.Contains(x.OwnerUserId))
-            .Select(x => new {
-              Id = x.JobId,
-              DateCreated = x.DateCreated,
-              OwnerUserId = x.OwnerUserId
-            })
-            .ToList();
-        });
+      var userIds = userPriorities.Select(x => x.UserId).ToList();
+      var jobs = pm.UseTransaction(() => {
+        return jobDao.GetAll()
+          .Where(x => userIds.Contains(x.OwnerUserId))
+          .Select(x => new {
+            Id = x.JobId,
+            DateCreated = x.DateCreated,
+            OwnerUserId = x.OwnerUserId
+          })
+          .ToList();
+      });
 
-        var taskJobRelations = tasks.Join(jobs,
-          task => task.JobId,
-          job => job.Id,
-          (task, job) => new { Task = task, JobInfo = job })
-          .OrderByDescending(x => x.Task.Priority)
-          .ToList();
+      var taskJobRelations = tasks.Join(jobs,
+        task => task.JobId,
+        job => job.Id,
+        (task, job) => new { Task = task, JobInfo = job })
+        .OrderByDescending(x => x.Task.Priority)
+        .ToList();
 
-        var scheduledTasks = new List<TaskInfoForScheduler>();
-        int priorityIndex = 0;
+      var scheduledTasks = new List<TaskInfoForScheduler>();
+      int priorityIndex = 0;
 
-        if (count == 0 || count > taskJobRelations.Count) count = taskJobRelations.Count;
+      if (count == 0 || count > taskJobRelations.Count) count = taskJobRelations.Count;
 
-        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.JobInfo.OwnerUserId == userPriorities[priorityIndex].UserId).ToArray(); // search for tasks with desired user priority
-          while (!priorityEntries.Any() && priorityIndex < userPriorities.Length - 1) {
+      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.JobInfo.OwnerUserId == userPriorities[priorityIndex].UserId).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].UserId).ToArray();
+        }
+        if (priorityEntries.Any()) { // tasks with desired user priority found
+          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(pm, userPriorities[priorityIndex]);
             priorityIndex++;
-            priorityEntries = taskJobRelations.Where(x => x.JobInfo.OwnerUserId == userPriorities[priorityIndex].UserId).ToArray();
-          }
-          if (priorityEntries.Any()) { // tasks with desired user priority found
-            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(pm, userPriorities[priorityIndex]);
-              priorityIndex++;
-            } else { // there are other tasks with higher priorities
-              taskJobRelations.Remove(defaultEntry);
-              scheduledTasks.Add(defaultEntry.Task);
-            }
-          } else {
+          } else { // there are other tasks with higher priorities
             taskJobRelations.Remove(defaultEntry);
             scheduledTasks.Add(defaultEntry.Task);
           }
-          if (priorityIndex >= (userPriorities.Length - 1)) priorityIndex = 0;
+        } else {
+          taskJobRelations.Remove(defaultEntry);
+          scheduledTasks.Add(defaultEntry.Task);
         }
-        return scheduledTasks;
+        if (priorityIndex >= (userPriorities.Length - 1)) priorityIndex = 0;
       }
+      return scheduledTasks;
+
     }