Changeset 7320 for branches/HiveHiveEngine

Timestamp:

01/12/12 17:14:36 (13 years ago)

Author:

ascheibe

Message:

#1744 fixed a bug in the job scheduler for hive engine tasks

Location:

branches/HiveHiveEngine

Files:

• HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (3 diffs)

branches/HiveHiveEngine/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -370 +370 @@
       var failedJobs = allHiveTasks.Where(x => x.Task.State != TaskState.Finished);
       if (failedJobs.Count() > 0) {
-        throw new HiveEngineException("Task failed: " + failedJobs.First().Task.StateLog.Last().Exception);
+        throw new HiveEngineException("Task (" + failedJobs.First().Task.Id + ") failed: " + failedJobs.First().Task.StateLog.Last().Exception);
       }
 

branches/HiveHiveEngine/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -112 +112 @@
     /// this is for the hive engine
     /// </summary>    
-    private IEnumerable<DT.Task> GetPausedParentTasks(IEnumerable<Guid> resourceIds, int count) {
-      using (var db = CreateContext()) {
+    private IEnumerable<DT.Task> GetHiveEngineParentTasks(IEnumerable<Guid> resourceIds, int count) {
+      using (var db = CreateContext()) {
+        //query for waiting parent hive engine tasks or parent hive engine tasks where all childrens are finished
         var query = from ar in db.AssignedResources
                     where resourceIds.Contains(ar.ResourceId)
-                       && ar.Task.State == TaskState.Paused
+                       && ar.Task.State == TaskState.Waiting
                        && ar.Task.IsParentTask
                        && !ar.Task.FinishWhenChildJobsFinished
@@ -122 +123 @@
                            where child.ParentTaskId == ar.Task.TaskId
                            select child).All(x => x.State == TaskState.Finished)
-                       && (from child in db.Tasks // avoid returning WaitForChildTasks task where no child-task exist (yet)
-                           where child.ParentTaskId == ar.Task.TaskId
-                           select child).Count() > 0
                     orderby ar.Task.Priority descending, db.Random()
                     select DT.Convert.ToDto(ar.Task);
@@ -135 +133 @@
         var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
 
-        //check for freshly uploaded hive engine tasks
-        var waitingParentJobs = GetParentTasks(resourceIds, count, false);
-        if (count > 0 && waitingParentJobs.Count() >= count) return waitingParentJobs.Take(count).ToArray();
-
-        //check if there are hive engine tasks which have finished childs 
-        waitingParentJobs = GetPausedParentTasks(resourceIds, count);
+        //check if there are hive engine tasks to calculate
+        var waitingParentJobs = GetHiveEngineParentTasks(resourceIds, count);
         if (count > 0 && waitingParentJobs.Count() >= count) return waitingParentJobs.Take(count).ToArray();
 
         var query = from ar in db.AssignedResources
                     where resourceIds.Contains(ar.ResourceId)
-                       && !(ar.Task.IsParentTask && ar.Task.FinishWhenChildJobsFinished)
+                       && !ar.Task.IsParentTask
                        && ar.Task.State == TaskState.Waiting
                        && ar.Task.CoresNeeded <= slave.FreeCores