Changeset 15630 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.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/HiveService.cs (modified) (2 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -361 +361 @@
         return pm.UseTransaction(() => {
           var jobs = jobDao.GetAll()
-            .Where(x => x.OwnerUserId == currentUserId
-                     || x.JobPermissions.Count(y => y.Permission != DA.Permission.NotAllowed
-                                                 && y.GrantedUserId == currentUserId) > 0)
+            .Where(x => x.State == DA.JobState.Online
+                          && (x.OwnerUserId == currentUserId
+                            || x.JobPermissions.Count(y => y.Permission != DA.Permission.NotAllowed 
+                              && y.GrantedUserId == currentUserId) > 0)
+                          )
             .Select(x => x.ToDto())
             .ToList();
@@ -524 +526 @@
     }
 
-    public void DeleteJob(Guid jobId) {
+    public void UpdateJobState(Guid jobId, DT.JobState jobState) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full);
       var pm = PersistenceManager;
-      using (new PerformanceLogger("DeleteJob")) {
+      using (new PerformanceLogger("UpdateJobState")) {
         var jobDao = pm.JobDao;
         pm.UseTransaction(() => {
-          // not necessary anymore: child tasks will be deleted by db-trigger
-          // now: tasks are deleted by jobId
-          // entries in AssignedJobResource will be deleted by foreign key clause CASCADE ON DELETE
-          jobDao.Delete(jobId);
-          pm.SubmitChanges();
+          var job = jobDao.GetById(jobId);
+          if(job != null) {
+            var jobStateEntity = jobState.ToEntity();
+            // note: allow solely state changes from "Online" to "StatisticsPending"
+            // and from "StatisticsPending" to "DeletionPending"
+            if (job.State == DA.JobState.Online && jobStateEntity == DA.JobState.StatisticsPending) {
+              job.State = jobStateEntity;
+              foreach(var task in job.Tasks
+              .Where(x => x.State == DA.TaskState.Waiting 
+                || x.State == DA.TaskState.Paused 
+                || x.State == DA.TaskState.Offline)) {
+                task.State = DA.TaskState.Aborted;
+              }
+              pm.SubmitChanges();
+            } else if(job.State == DA.JobState.StatisticsPending && jobStateEntity == DA.JobState.DeletionPending) {
+              job.State = jobStateEntity;
+              pm.SubmitChanges();
+            } 
+          }
         });
       }