Changeset 1500

Timestamp:

04/03/09 12:47:47 (16 years ago)

Author:

msteinbi

Message:

Scheduler checks for free cores now (#507)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/BusinessObjects/Client.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Scheduler/DefaultScheduler.cs (modified) (2 diffs)

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

@@ -41 +41 @@
     public int Memory { get; set; }
     [DataMember]
+    public int FreeMemory { get; set; }
+    [DataMember]
     public DateTime Login { get; set; }
     [DataMember]

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

@@ -216 +216 @@
 
         ResponseHB response = new ResponseHB();
+        response.ActionRequest = new List<MessageContainer>();
+
+        ClientInfo client = clientAdapter.GetById(hbData.ClientId);
 
         // check if the client is logged in
-        response.ActionRequest = new List<MessageContainer>();
-        if (clientAdapter.GetById(hbData.ClientId).State == State.offline ||
-            clientAdapter.GetById(hbData.ClientId).State == State.nullState) {
+        if (client.State == State.offline || client.State == State.nullState) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN;
@@ -226 +227 @@
           return response;
         }
+
+        client.NrOfFreeCores = hbData.FreeCores;
+        client.FreeMemory = hbData.FreeMemory;
 
         // save timestamp of this heartbeat
@@ -245 +249 @@
           response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
 
-        if (hbData.JobProgress != null) {
-          List<Job> jobsOfClient = new List<Job>(jobAdapter.GetActiveJobsOf(clientAdapter.GetById(hbData.ClientId)));
-          if (jobsOfClient == null || jobsOfClient.Count == 0) {
-            response.Success = false;
-            response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
-            return response;
-          }
-
-          foreach (KeyValuePair<Guid, double> jobProgress in hbData.JobProgress) {
-            Job curJob = jobAdapter.GetById(jobProgress.Key);
-            if (curJob.Client == null || curJob.Client.Id != hbData.ClientId) {
-              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
-              response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            } else {
-              // save job progress
-              curJob.Percentage = jobProgress.Value;
-              jobAdapter.Update(curJob);
-            }
-          }
-        }
+        processJobProcess(hbData, jobAdapter, clientAdapter, response);
+        clientAdapter.Update(client);
+
         tx.Commit();
         return response;
@@ -280 +263 @@
         if (session != null)
           session.EndSession();
+      }
+    }
+
+    /// <summary>
+    /// Process the Job progress sent by a client
+    /// </summary>
+    /// <param name="hbData"></param>
+    /// <param name="jobAdapter"></param>
+    /// <param name="clientAdapter"></param>
+    /// <param name="response"></param>
+    private void processJobProcess(HeartBeatData hbData, IJobAdapter jobAdapter, IClientAdapter clientAdapter, ResponseHB response) {
+      if (hbData.JobProgress != null) {
+        List<Job> jobsOfClient = new List<Job>(jobAdapter.GetActiveJobsOf(clientAdapter.GetById(hbData.ClientId)));
+        if (jobsOfClient == null || jobsOfClient.Count == 0) {
+          response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+          return;
+        }
+
+        foreach (KeyValuePair<Guid, double> jobProgress in hbData.JobProgress) {
+          Job curJob = jobAdapter.GetById(jobProgress.Key);
+          if (curJob.Client == null || curJob.Client.Id != hbData.ClientId) {
+            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
+            response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
+          } else {
+            // save job progress
+            curJob.Percentage = jobProgress.Value;
+            jobAdapter.Update(curJob);
+          }
+        }
       }
     }

trunk/sources/HeuristicLab.Hive.Server.Scheduler/DefaultScheduler.cs

@@ -30 +30 @@
           session.GetDataAdapter<Job, IJobAdapter>();
 
-        List<Job> allOfflineJobs = new List<Job>(jobAdapter.GetJobsByState(State.offline));
-        return (allOfflineJobs.Count > 0);
+        List<Job> allOfflineJobsForClient = new List<Job>(jobAdapter.FindJobs(State.offline, hbData.FreeCores, hbData.FreeMemory));
+        return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
       }
       finally {
@@ -52 +52 @@
         jobLock.WaitOne();
 
-        LinkedList<Job> allOfflineJobs = new LinkedList<Job>(jobAdapter.GetJobsByState(State.offline));
+        ClientInfo client = clientAdapter.GetById(clientId);
+        LinkedList<Job> allOfflineJobsForClient = new LinkedList<Job>(jobAdapter.FindJobs(State.offline, client.NrOfFreeCores, client.FreeMemory ));
 
-        Job job2Calculate = null;
-        if (allOfflineJobs != null && allOfflineJobs.Count > 0) {
-          job2Calculate = allOfflineJobs.First.Value;
-          job2Calculate.State = State.calculating;
-          job2Calculate.Client = clientAdapter.GetById(clientId);
-          job2Calculate.Client.State = State.calculating;
+        Job jobToCalculate = null;
+        if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
+          jobToCalculate = allOfflineJobsForClient.First.Value;
+          jobToCalculate.State = State.calculating;
+          jobToCalculate.Client = client;
+          jobToCalculate.Client.State = State.calculating;
 
-          job2Calculate.DateCalculated = DateTime.Now;
-          jobAdapter.Update(job2Calculate);
+          jobToCalculate.DateCalculated = DateTime.Now;
+          jobAdapter.Update(jobToCalculate);
         }
         jobLock.ReleaseMutex();
         /// End Critical section ///
 
-        return job2Calculate;
+        return jobToCalculate;
       }
       finally {