Changeset 1160

Timestamp:

01/21/09 16:22:25 (15 years ago)

Author:

msteinbi

Message:

Implementing Lifecycle Management (#453)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Server.ADODataAccess/app.config (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.Core/JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/app.config

@@ -5 +5 @@
     <connectionStrings>
         <add name="HeuristicLab.Hive.Server.ADODataAccess.Properties.Settings.HiveServerConnectionString"
-            connectionString="Data Source=10.22.20.84;Initial Catalog=HiveServer;Persist Security Info=True;User ID=hive;Password=hive"
+            connectionString="Data Source=10.22.20.84;Initial Catalog=HiveServerTesting;Persist Security Info=True;User ID=hive;Password=hive"
             providerName="System.Data.SqlClient" />
     </connectionStrings>

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

@@ -80 +80 @@
     void lifecycleManager_OnServerHeartbeat(object sender, EventArgs e) {
       List<ClientInfo> allClients = new List<ClientInfo>(clientAdapter.GetAll());
-      List<Job> allJobs = new List<Job>(jobAdapter.GetAll());
 
       foreach (ClientInfo client in allClients) {
@@ -89 +88 @@
             client.State = State.offline;
             clientAdapter.Update(client);
+            foreach (Job job in jobAdapter.GetJobsOf(client)) {
+              jobManager.ResetJobsDependingOnResults(job);
+            }
           } else {
             DateTime lastHbOfClient = lastHeartbeats[client.ClientId];
@@ -98 +100 @@
               if (client.State == State.calculating) {
                 // check wich job the client was calculating and reset it
-                foreach (Job job in allJobs) {
-                  if (job.Client.ClientId == client.ClientId) {
-                    jobManager.ResetJobsDependingOnResults(job);
-                  }
+                foreach (Job job in jobAdapter.GetJobsOf(client)) {
+                  jobManager.ResetJobsDependingOnResults(job);
                 }
               }
@@ -195 +195 @@
 
       if (hbData.jobProgress != null) {
+        List<Job> jobsOfClient = new List<Job>(jobAdapter.GetJobsOf(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<long, double> jobProgress in hbData.jobProgress) {
           Job curJob = jobAdapter.GetById(jobProgress.Key);
-          curJob.Percentage = jobProgress.Value;
-          jobAdapter.Update(curJob);
+          if (curJob.Client == null || curJob.Client.ClientId != hbData.ClientId) {
+            response.Success = false;
+            response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+          } else {
+            curJob.Percentage = jobProgress.Value;
+            jobAdapter.Update(curJob);
+          }
         }
       }
@@ -228 +240 @@
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
-        return response;
+      } else {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
       }
 
       jobLock.ReleaseMutex();
-
-      response.Success = true;
-      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
+      /// End Critical section ///
+
       return response;
     }

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

@@ -50 +50 @@
 
     public void ResetJobsDependingOnResults(Job job) {
-      List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetAll());
+      List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
       JobResult lastJobResult = null;
       foreach (JobResult jR in allJobResults) {
-        if (jR.Job != null && jR.Job.Id == job.Id) {
-          if (lastJobResult != null) {
-            // if lastJobResult was before the current jobResult the lastJobResult must be updated
-            if ((jR.timestamp.Subtract(lastJobResult.timestamp)).Seconds > 0)
-              lastJobResult = jR;
-          }
-        }
+        // if lastJobResult was before the current jobResult the lastJobResult must be updated
+        if (lastJobResult == null ||          
+            (jR.timestamp > lastJobResult.timestamp))
+          lastJobResult = jR;
       }
       if (lastJobResult != null) {
-        job.Client = null;
         job.Percentage = lastJobResult.Percentage;
-        job.State = State.offline;
         job.SerializedJob = lastJobResult.Result;
       } else {
-        job.Client = null;
         job.Percentage = 0;
-        job.State = State.offline;
       }
+
+      job.Client = null;
+      job.State = State.offline;
+
       jobAdapter.Update(job);
     }