Changeset 1577 for trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

Timestamp:

04/16/09 17:33:09 (15 years ago)

Author:

msteinbi

Message:

added request and abort snapshot (#572)

File:

• trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (9 diffs)

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

@@ -240 +240 @@
         heartbeatLock.ExitWriteLock();
 
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED;
         // check if client has a free core for a new job
         // if true, ask scheduler for a new job for this client
@@ -248 +246 @@
         else
           response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
+
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED;
 
         processJobProcess(hbData, jobAdapter, clientAdapter, response);
@@ -287 +288 @@
             response.Success = false;
             response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
-          } else if (curJob.State == State.finished) {
-            // another client has finished this job allready
-            // the client can abort it
+          } else if (curJob.State == State.abort) {
+            // a request to abort the job has been set
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
           } else {
@@ -295 +295 @@
             curJob.Percentage = jobProgress.Value;
             jobAdapter.Update(curJob);
+
+            if (curJob.State == State.requestSnapshot) {
+              // a request for a snapshot has been set
+              response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.RequestSnapshot, curJob.Id));
+            }
           }
         }
@@ -301 +306 @@
    
     /// <summary>
-    /// if the client asked to pull a job he calls this method
+    /// if the client was told to pull a job he calls this method
     /// the server selects a job and sends it to the client
     /// </summary>
@@ -348 +353 @@
           jobAdapter.GetById(jobId);
 
+        if (job == null) {
+          response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
+          response.JobId = jobId;
+          return response;
+        }
         if (job.Client == null) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+          response.JobId = jobId;
           return response;
         }
@@ -356 +368 @@
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB;
-          return response;
-        }
-        if (job == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
+          response.JobId = jobId;
           return response;
         }
@@ -366 +374 @@
           response.Success = true;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
+          response.JobId = jobId;
           return response;
         }
@@ -371 +380 @@
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
+          response.JobId = jobId;
           return response;
         }