Changeset 6168 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Timestamp:

05/09/11 14:12:10 (14 years ago)

Author:

cneumuel

Message:

#1233

• removed Job-dto objects from slave core (since it stores outdated objects)
• added command textbox to HiveJobView
• improved the way the control buttons behave in HiveJobView
• improved job control (pause and stop is also possible when job is not currently calculating)
• improved gantt chart view (last state log entry is also displayed)
• unified code for downloading jobs between experiment manager and hive engine

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -171 +171 @@
     public void StopJob(Guid jobId) {
       trans.UseTransaction(() => {
-        //dao.UpdateJobState(jobId, JobState.Aborted, null, auth.UserId, string.Empty);
         var job = dao.GetJob(jobId);
-        job.Command = Command.Stop;
-        dao.UpdateJob(job);
+        if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
+          job.Command = Command.Stop;
+          dao.UpdateJob(job);
+        } else {
+          if (job.State != JobState.Aborted && job.State != JobState.Finished && job.State != JobState.Failed) {
+            job = UpdateJobState(jobId, JobState.Aborted, null, null, string.Empty);
+          }
+        }
       });
     }
@@ -183 +188 @@
     public void PauseJob(Guid jobId) {
       trans.UseTransaction(() => {
-        //dao.UpdateJobState(jobId, JobState.Paused, null, auth.UserId, string.Empty);
         var job = dao.GetJob(jobId);
-        job.Command = Command.Pause;
-        dao.UpdateJob(job);
+        if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
+          job.Command = Command.Pause;
+          dao.UpdateJob(job);
+        } else {
+          job = UpdateJobState(jobId, JobState.Paused, null, null, string.Empty);
+        }
       });
     }