Changeset 1811

Timestamp:

05/14/09 16:55:44 (16 years ago)

Author:

msteinbi

Message:

small refactorings in snapshot and abort functionality (#466)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs

@@ -79 +79 @@
     public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
     public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
+    public static strign RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
 
     public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -305 +305 @@
             // save job progress
             curJob.Percentage = jobProgress.Value;
-            jobAdapter.Update(curJob);
 
             if (curJob.State == State.requestSnapshot) {
@@ -312 +311 @@
               curJob.State = State.requestSnapshotSent;
             }
+            jobAdapter.Update(curJob);
           }
         }
@@ -397 +397 @@
         Job job =
           jobAdapter.GetById(jobId);
-
+        
         if (job == null) {
           response.Success = false;
@@ -403 +403 @@
           response.JobId = jobId;
           return response;
+        }
+        if (job.State == State.abort) {
+          response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
         }
         if (job.Client == null) {
@@ -440 +444 @@
           client.State = State.idle;
           clientAdapter.Update(client);
-
-          List<JobResult> jobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
-          foreach (JobResult currentResult in jobResults)
-            jobResultAdapter.Delete(currentResult);
-        }
+        }
+        List<JobResult> jobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
+        foreach (JobResult currentResult in jobResults)
+          jobResultAdapter.Delete(currentResult);
 
         JobResult jobResult =

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

@@ -308 +308 @@
           return response; // no commit needed
         }
-        if (job.State != State.calculating) {
+        if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;