Changeset 8997 for branches

Timestamp:

12/04/12 16:34:49 (12 years ago)

Author:

ascheibe

Message:

#1712 removed unnecessary query because scheduling is now serialized

File:

• branches/HiveTaskScheduler/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (3 diffs)

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

@@ -79 +79 @@
               if (availableJobs.Any()) {
                 var job = availableJobs.First();
-                if (AssignJob(slave, job))
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, job.Id));
+                AssignJob(slave, job);
+                actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, job.Id));
               }
             }
@@ -95 +95 @@
     }
 
-    // returns true if assignment was successful
-    private bool AssignJob(Slave slave, Task task) {
-      // load task again and check if it is still available (this is an attempt to reduce the race condition which causes multiple heartbeats to get the same task assigned)
-      if (dao.GetTask(task.Id).State != TaskState.Waiting) return false;
-
+    private void AssignJob(Slave slave, Task task) {
       task = dao.UpdateTaskState(task.Id, DataAccess.TaskState.Transferring, slave.Id, null, null);
 
@@ -105 +101 @@
       task.LastHeartbeat = DateTime.Now;
       dao.UpdateTask(task);
-      return true;
     }