Changeset 7434 for trunk/sources

Timestamp:

01/31/12 22:22:42 (13 years ago)

Author:

ascheibe

Message:

#1722 When setting timed-out slaves offline the tasks on these slaves shouldn't be set to waiting as this leads to performance problems and deadlocks with big statelog tables. Setting tasks to waiting is done by another method of the cleanup process more efficiently.

File:

• trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -45 +45 @@
     }
 
-    public void Cleanup() { 
+    public void Cleanup() {
       trans.UseTransaction(() => {
         SetTimeoutSlavesOffline();
@@ -89 +89 @@
         if (!slave.LastHeartbeat.HasValue || (DateTime.Now - slave.LastHeartbeat.Value) > HeuristicLab.Services.Hive.Properties.Settings.Default.SlaveHeartbeatTimeout) {
           slave.SlaveState = DT.SlaveState.Offline;
-          SetTasksWaiting(slave.Id);
           dao.UpdateSlave(slave);
         }
@@ -102 +101 @@
       foreach (var task in parentTasksToFinish) {
         dao.UpdateTaskState(task.Id, TaskState.Finished, null, null, string.Empty);
-      }
-    }
-
-    private void SetTasksWaiting(Guid slaveId) {
-      var tasks = dao.GetTasks(x => x.State == TaskState.Calculating).Where(x => x.StateLog.Last().SlaveId == slaveId);
-      foreach (var j in tasks) {
-        DT.Task task = dao.UpdateTaskState(j.Id, TaskState.Waiting, slaveId, null, "Slave timed out.");
-        task.Command = null;
-        dao.UpdateTask(task);
       }
     }