Changeset 1004

Timestamp:

12/17/08 14:36:20 (16 years ago)

Author:

msteinbi

Message:

Implementation of ClientCommunicator, pullJob sendHeartbeat (#399)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/BusinessObjects/Client.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/HiveServerMessages.resx (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (6 diffs)

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

@@ -41 +41 @@
     public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
     public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
+    public static string RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET = "Communicator.IdMustNotBeSet";
+    public static string RESPONSE_COMMUNICATOR_NO_JO_WITH_THIS_ID = "Communicator.NoJobWithThisId";
+    public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
 
     public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";

trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/Client.cs

@@ -28 +28 @@
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
 
-  public enum State { nullState, idle, calculating, offline };
+  public enum State { nullState, idle, calculating, offline, finished };
 
   [DataContract]

trunk/sources/HeuristicLab.Hive.Contracts/HiveServerMessages.resx

@@ -217 +217 @@
     <value>A user with this username exists allready</value>
   </data>
+  <data name="Communicator.IdMustNotBeSet" xml:space="preserve">
+    <value>The id must not be set in this context</value>
+  </data>
+  <data name="Communicator.NoJobWithThisId" xml:space="preserve">
+    <value>There exists no job with this id</value>
+  </data>
 </root>

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs

@@ -40 +40 @@
     ResponseJob PullJob(Guid clientId);
     [OperationContract]
-    ResponseResultReceived SendJobResult(JobResult Result, bool finished);
+    ResponseResultReceived SendJobResult(JobResult result, bool finished);
     [OperationContract]
     Response Logout(Guid clientId);

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

@@ -17 +17 @@
   /// </summary>
   public class ClientCommunicator: IClientCommunicator {
-    int nrOfJobs = 1;
+    int nrOfJobs = 10;
 
     IClientAdapter clientAdapter;
     IJobAdapter jobAdapter;
+    IJobResultsAdapter jobResultAdapter;
 
     public ClientCommunicator() {
@@ -26 +27 @@
       jobAdapter = ServiceLocator.GetJobAdapter();
 
-      for (int i = 0; i < 10; i++) {
+      for (int i = 0; i < nrOfJobs; i++) {
         Job job = new Job();
         job.Id = i;
@@ -39 +40 @@
     public Response Login(ClientInfo clientInfo) {
       Response response = new Response();
-      response.Success = true;
 
       ICollection<ClientInfo> allClients = clientAdapter.GetAll();
       ClientInfo client = clientAdapter.GetById(clientInfo.ClientId);
-      if (client != null) {
-        if (client.State != State.offline) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE;
-        }
-      } 
-
-      if (response.Success) {
-        clientAdapter.Update(clientInfo);
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_SUCCESS;
+      if (client != null && client.State != State.offline) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE;
+        return response;
       }
+      clientAdapter.Update(clientInfo);
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_SUCCESS;
 
       return response;
@@ -64 +61 @@
       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HARDBEAT_RECEIVED;
       response.ActionRequest = new List<MessageContainer>();
-      List<Job> allJobs = new List<Job>(jobAdapter.GetAll());
-      if (allJobs.Count > 0 && hbData.freeCores > 0) 
+      List<Job> allOfflineJobs = new List<Job>(jobAdapter.GetJobsByState(State.offline));
+      if (allOfflineJobs.Count > 0 && hbData.freeCores > 0) 
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchJob));
       else
@@ -76 +73 @@
       ResponseJob response = new ResponseJob();
       lock (this) {
-        LinkedList<Job> allJobs = new LinkedList<Job>(jobAdapter.GetAll());
-        if (allJobs.Last != null) {
-          response.JobId = allJobs.Last.Value.Id;
-          jobAdapter.Delete(allJobs.Last.Value);   
+        LinkedList<Job> allOfflineJobs = new LinkedList<Job>(jobAdapter.GetJobsByState(State.offline));
+        if (allOfflineJobs != null && allOfflineJobs.Count > 0) {
+          Job job2Calculate = allOfflineJobs.First.Value;
+          job2Calculate.State = State.calculating;
+          response.JobId = job2Calculate.Id;
+          jobAdapter.Update(job2Calculate);          
           response.SerializedJob = PersistenceManager.SaveToGZip(new TestJob());
           response.Success = true;
@@ -91 +90 @@
     }
 
-    public ResponseResultReceived SendJobResult(JobResult Result, bool finished) {
+    public ResponseResultReceived SendJobResult(JobResult result, bool finished) {
       ResponseResultReceived response = new ResponseResultReceived();
+      if (result.Id != 0) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET;
+        return response;
+      }
+      Job job = jobAdapter.GetById(result.JobId);
+      if (job == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JO_WITH_THIS_ID;
+        return response;
+      }
+      if (job.State != State.calculating) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
+        return response;
+      }
+      if (finished) {
+        job.State = State.finished;
+        jobAdapter.Update(job);
+
+        List<JobResult> jobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
+        foreach (JobResult currentResult in jobResults) 
+          jobResultAdapter.Delete(currentResult);
+      }
+      jobResultAdapter.Update(result);    
+
       response.Success = true;
       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
-      response.JobId = Result.JobId;
+      response.JobId = result.JobId;
 
       return response;