Changeset 7178

Timestamp:

12/12/11 19:19:05 (13 years ago)

Author:

ascheibe

Message:

#1672 disabled checking if there are parent tasks which should to be calculated because this case doesn't exist at the moment

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3

Files:

• HiveDao.cs (modified) (2 diffs)
• Manager/EventManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -115 +115 @@
       using (var db = CreateContext()) {
         var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
-        var waitingParentJobs = GetParentTasks(resourceIds, count, false);
-        if (count > 0 && waitingParentJobs.Count() >= count) return waitingParentJobs.Take(count).ToArray();
+        //Originally we checked here if there are parent tasks which should be calculated (with GetParentTasks(resourceIds, count, false);).
+        //Because there is at the moment no case where this makes sense (there don't exist parent tasks which need to be calculated), 
+        //we skip this step because it's wasted runtime
 
         var query = from ar in db.AssignedResources
@@ -127 +128 @@
                     select DT.Convert.ToDto(ar.Task);
         var waitingTasks = (count == 0 ? query : query.Take(count)).ToArray();
-        return waitingTasks.Union(waitingParentJobs).OrderByDescending(x => x.Priority);
+        return waitingTasks;
       }
     }

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

@@ -43 +43 @@
 
     public void Cleanup() {
-      log.Log("EventManager.Cleanup()");
       SetTimeoutSlavesOffline();
       SetTimeoutTasksWaiting();