Changeset 8687 for branches/HiveTaskScheduler/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

Timestamp:

09/24/12 15:24:24 (12 years ago)

Author:

jkarder

Message:

#1712: initial commit

Location:

branches/HiveTaskScheduler

Files:

• . (added)
• HeuristicLab.Services.Hive (copied) (copied from trunk/sources/HeuristicLab.Services.Hive)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (2 diffs)

branches/HiveTaskScheduler/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -31 +31 @@
       get { return ServiceLocator.Instance.HiveDao; }
     }
-    private IAuthorizationManager auth {
-      get { return ServiceLocator.Instance.AuthorizationManager; }
+    private ITaskScheduler taskScheduler {
+      get { return ServiceLocator.Instance.TaskScheduler; }
     }
 
@@ -63 +63 @@
         // assign new task
         if (heartbeat.AssignJob && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
-          var availableJobs = dao.GetWaitingTasks(slave, 1);
-          if (availableJobs.Count() > 0) {
+          var availableJobs = taskScheduler.Schedule(dao.GetWaitingTasks(slave));
+          if (availableJobs.Any()) {
             var job = availableJobs.First();
             if (AssignJob(slave, job))