Changeset 16622

Timestamp:

02/27/19 12:44:11 (6 years ago)

Author:

jkarder

Message:

#2839: worked on hive project management

• Core.cs
  • locked checks for amount of available resources (cores/memory)
  • task state of aborted tasks is now updated accordingly
• JobDao.cs
  • improved readability of GetJobsReadyForDeletionQuery
• HiveStatisticsGenerator.cs
  • DimJobs, FactTasks and Jobs (DeletionPending) are now updated in one transaction

Location:

trunk

Files:

• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (modified) (2 diffs)

trunk/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);
     }

trunk/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs

@@ -88 +88 @@
         (from job in db.GetTable<Job>()
          where job.State == JobState.StatisticsPending
-         && (from task in db.GetTable<Task>()
-             where task.JobId == job.JobId
-             select task.State == TaskState.Finished
-              || task.State == TaskState.Aborted
-              || task.State == TaskState.Failed).All(x => x)
+               && (from task in db.GetTable<Task>()
+                   where task.JobId == job.JobId
+                   select task).All(x => x.State == TaskState.Finished
+                                      || x.State == TaskState.Aborted
+                                      || x.State == TaskState.Failed)
          select job));
     #endregion

trunk/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs

@@ -66 +66 @@
 
           pm.UseTransaction(() => {
-            UpdateFactTaskTable(pm);
             try {
-              pm.SubmitChanges();
+              UpdateFactTaskTable(pm);
               UpdateExistingDimJobs(pm);
+              FlagJobsForDeletion(pm);
               pm.SubmitChanges();
             }
@@ -81 +81 @@
           });
         }
-
-        pm.UseTransaction(() => {
-          FlagJobsForDeletion(pm);
-          pm.SubmitChanges();
-        });
       }
     }