Changeset 15262 for stable/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

07/16/17 13:08:06 (7 years ago)

Author:

jkarder

Message:

#2784: merged r14901 and r15121 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (3 diffs)

stable/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -263 +263 @@
           if (task.State == DA.TaskState.Calculating || task.State == DA.TaskState.Transferring) {
             task.Command = DA.Command.Pause;
-          }
-          UpdateTaskState(pm, task, DT.TaskState.Paused, null, null, string.Empty);
+          } else if (task.State != DA.TaskState.Paused
+                     && task.State != DA.TaskState.Aborted
+                     && task.State != DA.TaskState.Finished
+                     && task.State != DA.TaskState.Failed) {
+            UpdateTaskState(pm, task, DT.TaskState.Paused, null, null, string.Empty);
+          }
           pm.SubmitChanges();
         });
@@ -962 +966 @@
       var stateLogDao = pm.StateLogDao;
       var taskStateEntity = taskState.ToEntity();
-      if (task.Command == DA.Command.Pause && task.State == DA.TaskState.Paused
-          || task.Command == DA.Command.Abort && task.State == DA.TaskState.Aborted
-          || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) {
-        task.Command = null;
-      } else if (taskStateEntity == DA.TaskState.Paused && task.Command == null) {
+
+      if (task.State == DA.TaskState.Calculating && taskStateEntity == DA.TaskState.Paused && task.Command == null) {
         // slave paused and uploaded the task (no user-command) -> set waiting.
         taskStateEntity = DA.TaskState.Waiting;
       }
+
       stateLogDao.Save(new DA.StateLog {
         State = taskStateEntity,
@@ -978 +980 @@
         Exception = exception
       });
+
       task.State = taskStateEntity;
+
+      if (task.Command == DA.Command.Pause && task.State == DA.TaskState.Paused
+          || task.Command == DA.Command.Abort && task.State == DA.TaskState.Aborted
+          || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) {
+        task.Command = null;
+      }
     }