Changeset 12789

Timestamp:

07/21/15 11:48:49 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Access.DataAccess-3.3:

• Added a new method to the TaskDao

HeuristicLab.Services.Hive-3.3:

• Added NewEventManager.cs
• Updated HiveJanitor.cs
• Updated ServiceLocator.cs

Location:

branches/HiveStatistics/sources

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/NewEventManager.cs (added)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs

@@ -27 +27 @@
 namespace HeuristicLab.Services.Hive.DataAccess.Daos {
   public class TaskDao : GenericDao<Guid, Task> {
+    private Table<AssignedResource> AssignedResourceTable {
+      get { return DataContext.GetTable<AssignedResource>(); }
+    }
+
     public TaskDao(DataContext dataContext) : base(dataContext) { }
 
@@ -51 +55 @@
       //we skip this step because it's wasted runtime
       return DataContext.ExecuteQuery<TaskPriorityInfo>(GetWaitingTasksQueryString, slave.ResourceId, Enum.GetName(typeof(TaskState), TaskState.Waiting), slave.FreeCores, slave.FreeMemory).ToList();
+    }
+
+    /// <summary>
+    /// returns all parent tasks which are waiting for their child tasks to finish
+    /// </summary>
+    /// <param name="resourceIds">list of resourceids which for which the task should be valid</param>
+    /// <param name="count">maximum number of task to return</param>
+    /// <param name="finished">if true, all parent task which have FinishWhenChildJobsFinished=true are returned, otherwise only FinishWhenChildJobsFinished=false are returned</param>
+    /// <returns></returns>
+    public IEnumerable<Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished) {
+      var query = from ar in AssignedResourceTable
+                  where resourceIds.Contains(ar.ResourceId)
+                     && ar.Task.State == TaskState.Waiting
+                     && ar.Task.IsParentTask
+                     && (finished ? ar.Task.FinishWhenChildJobsFinished : !ar.Task.FinishWhenChildJobsFinished)
+                     && (from child in Table
+                         where child.ParentTaskId == ar.Task.TaskId
+                         select child.State == TaskState.Finished
+                             || child.State == TaskState.Aborted
+                             || child.State == TaskState.Failed).All(x => x)
+                     && (from child in Table // avoid returning WaitForChildTasks task where no child-task exist (yet)
+                         where child.ParentTaskId == ar.Task.TaskId
+                         select child).Any()
+                  orderby ar.Task.Priority descending
+                  select ar.Task;
+      return count == 0 ? query.ToArray() : query.Take(count).ToArray();
     }
 

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -143 +143 @@
     <Compile Include="HiveStatisticsGenerator.cs" />
     <Compile Include="Interfaces\IStatisticsGenerator.cs" />
+    <Compile Include="Manager\NewEventManager.cs" />
     <Compile Include="Manager\NewHeartbeatManager.cs" />
     <Compile Include="NewHiveService.cs" />

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

@@ -31 +31 @@
     private AutoResetEvent generateStatisticsWaitHandle;
 
-    private ITransactionManager trans {
-      get { return ServiceLocator.Instance.TransactionManager; }
+    private IPersistenceManager PersistenceManager {
+      get { return ServiceLocator.Instance.PersistenceManager; }
     }
-
-    private IEventManager eventManager {
+    private IEventManager EventManager {
       get { return ServiceLocator.Instance.EventManager; }
     }
 
-    private IStatisticsGenerator statisticsGenerator {
+    private IStatisticsGenerator StatisticsGenerator {
       get { return ServiceLocator.Instance.StatisticsGenerator; }
-    }
-
-    private IHiveDao dao {
-      get { return ServiceLocator.Instance.HiveDao; }
     }
 
@@ -64 +59 @@
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup.");
           bool cleanup = false;
-          trans.UseTransaction(() => {
-            DateTime lastCleanup = dao.GetLastCleanup();
-            if (DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
-              dao.SetLastCleanup(DateTime.Now);
-              cleanup = true;
-            }
-          }, true);
-
+          using (var pm = PersistenceManager) {
+            var lifecycleDao = pm.LifecycleDao;
+            pm.UseTransaction(() => {
+              var lifecycle = lifecycleDao.GetLastLifecycle();
+              if (lifecycle == null
+                  || DateTime.Now - lifecycle.LastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
+                lifecycleDao.UpdateLifecycle();
+                cleanup = true;
+              }
+              pm.SubmitChanges();
+            }, true);
+          }
           if (cleanup) {
-            eventManager.Cleanup();
+            EventManager.Cleanup();
           }
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: cleanup finished.");
@@ -89 +88 @@
         try {
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting generate statistics.");
-          statisticsGenerator.GenerateStatistics();
+          StatisticsGenerator.GenerateStatistics();
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: generate statistics finished.");
         }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -82 +82 @@
     public IEventManager EventManager {
       get {
-        if (eventManager == null) eventManager = new EventManager();
+        if (eventManager == null) eventManager = new NewEventManager();
         return eventManager;
       }