Changeset 15630 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

Timestamp:

01/18/18 15:08:25 (6 years ago)

Author:

jzenisek

Message:

#2839

• updated Heartbeat processing (regarding: checking against AssignedJobResources and handling of the updated Job deletion routine)
• updated Job deletion routine(still in progress at GenerateStatistics)

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (2 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -34 +34 @@
     public void Cleanup() {
       var pm = PersistenceManager;
+
+      pm.UseTransaction(() => {
+        FinishJobDeletion(pm);
+        pm.SubmitChanges();
+      });
+
       pm.UseTransaction(() => {
         SetTimeoutSlavesOffline(pm);
@@ -45 +51 @@
         pm.SubmitChanges();
       });
+    }
+
+    /// <summary>
+    /// Deletes all jobs which are in state "DeletionPending" (this will include all corresponding tasks).
+    /// The state "DeletionPending" is set by HiveJanitor > StatisticsGenerator
+    /// </summary>
+    private void FinishJobDeletion(IPersistenceManager pm) {
+      var jobDao = pm.JobDao;
+      jobDao.DeleteByState(JobState.DeletionPending);
     }