Changeset 4042 for branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

Timestamp:

07/18/10 22:16:04 (14 years ago)

Author:

kgrading

Message:

#828 added various improvements to the plugin cache manager, the execution engine, the transaction handling on the serverside and the server console

File:

• branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (3 diffs)

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

@@ -105 +105 @@
       ResponseList<JobDto> response = new ResponseList<JobDto>();
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
+      response.Success = true;
       return response;
     }
@@ -237 +238 @@
     }
 
+    //Requested means: there MUST be a job result which gets sent back
     public ResponseObject<SerializedJob>
-      GetLastSerializedJobResultOf(Guid jobId, bool requested) {
+      GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
       ResponseObject<SerializedJob> response =
         new ResponseObject<SerializedJob>();
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (requested && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
+
+      //if it's a snapshot but the result hasn't reached the server yet...
+      if (snapshot && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
@@ -250 +254 @@
       }
 
+      //if it's NOT a snapshot, NEITHER request NOR is it finished
+      if(!requested && !snapshot && job.State != State.finished) {      
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+
+        return response;
+      }
+
+      //every other case - snapshot, job finished or it's requested
       response.Success = true;
       response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
       response.Obj = new SerializedJob();
       response.Obj.JobInfo = job;
+
       response.Obj.SerializedJobData =
         DaoLocator.JobDao.GetBinaryJobFile(jobId);
+
       return response;
     }