Changeset 17067 for stable/HeuristicLab.Clients.Hive.Slave

Timestamp:

07/04/19 15:20:26 (5 years ago)

Author:

mkommend

Message:

#2839: Merged 16622, 16878 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (3 diffs)

stable/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -38 +38 @@
   /// </summary>
   public class Core : MarshalByRefObject {
+    private static readonly object locker = new object();
+
     private static HeartbeatManager heartbeatManager;
     public static HeartbeatManager HeartbeatManager {
@@ -240 +242 @@
         task = wcfService.GetTask(taskId);
         if (task == null) throw new TaskNotFoundException(taskId);
-        if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
-        if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
-        SlaveStatusInfo.IncrementUsedCores(task.CoresNeeded); usedCores = task.CoresNeeded;
+        lock (locker) {
+          // the amount of used cores/memory could exceed the amount of available cores/memory
+          // if HandleCalculateTask is called simultaneously from within two different tasks
+          if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
+          if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
+          SlaveStatusInfo.IncrementUsedCores(task.CoresNeeded); usedCores = task.CoresNeeded;
+        }
         TaskData taskData = wcfService.GetTaskData(taskId);
         if (taskData == null) throw new TaskDataNotFoundException(taskId);
@@ -400 +406 @@
 
     private void taskManager_TaskAborted(object sender, EventArgs<SlaveTask> e) {
+      var slaveTask = e.Value;
+      var task = wcfService.GetTask(slaveTask.TaskId);
+      wcfService.UpdateJobState(task.Id, TaskState.Aborted, null);
       SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
     }