Changeset 1141 for trunk

Timestamp:

01/15/09 15:56:08 (16 years ago)

Author:

msteinbi

Message:

Implementing Lifecycle Management (#453)

Location:

trunk/sources/HeuristicLab.Hive.Server.Core

Files:

• ClientCommunicator.cs (modified) (6 diffs)
• HeuristicLab.Hive.Server.Core.csproj (modified) (1 diff)
• InternalInterfaces/IInternalJobManager.cs (added)
• JobManager.cs (modified) (3 diffs)

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

@@ -33 +33 @@
 using HeuristicLab.Hive.JobBase;
 using System.Runtime.CompilerServices;
+using HeuristicLab.Hive.Server.Core.InternalInterfaces;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -46 +47 @@
     IJobResultsAdapter jobResultAdapter;
     ILifecycleManager lifecycleManager;
+    IInternalJobManager jobManager;
 
     /// <summary>
@@ -57 +59 @@
       jobResultAdapter = ServiceLocator.GetJobResultsAdapter();
       lifecycleManager = ServiceLocator.GetLifecycleManager();
+      jobManager = ServiceLocator.GetJobManager() as 
+        IInternalJobManager;
 
       lifecycleManager.RegisterHeartbeat( 
@@ -90 +94 @@
                 foreach (Job job in allJobs) {
                   if (job.Client.ClientId == client.ClientId) {
-                    resetJobsDependingOnResults(job);
+                    jobManager.ResetJobsDependingOnResults(job);
                   }
                 }
@@ -108 +112 @@
     }
 
-    private void resetJobsDependingOnResults(Job job) {
-      List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetAll());
-      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 != null) {
-        job.Client = null;
-        job.Percentage = lastJobResult.Percentage;
-        job.State = State.idle;
-        job.SerializedJob = lastJobResult.Result;
-      } else {
-        job.Client = null;
-        job.Percentage = 0;
-        job.State = State.idle;
-      }
-      jobAdapter.Update(job);
-    }
-
     #region IClientCommunicator Members
 
@@ -338 +317 @@
         foreach (Job job in allJobs) {
           if (job.Client.ClientId == client.ClientId) {
-            resetJobsDependingOnResults(job);
+            jobManager.ResetJobsDependingOnResults(job);
           }
         }

trunk/sources/HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj

@@ -82 +82 @@
     <Compile Include="InternalInterfaces\DataAccess\IUserAdapter.cs" />
     <Compile Include="InternalInterfaces\DataAccess\IUserGroupAdapter.cs" />
+    <Compile Include="InternalInterfaces\IInternalJobManager.cs" />
     <Compile Include="JobManager.cs" />
     <Compile Include="LifecycleManager.cs" />

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

@@ -28 +28 @@
 using HeuristicLab.Hive.Contracts;
 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
+using HeuristicLab.Hive.Server.Core.InternalInterfaces;
 
 namespace HeuristicLab.Hive.Server.Core {
-  class JobManager: IJobManager {
+  class JobManager: IJobManager, IInternalJobManager {
 
     IJobAdapter jobAdapter;
@@ -48 +49 @@
     }
 
-    private void resetJobsDependingOnResults(Job job) {
+    public void ResetJobsDependingOnResults(Job job) {
       List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetAll());
       JobResult lastJobResult = null;
@@ -77 +78 @@
       foreach (Job curJob in allJobs) {
         if (curJob.State == State.calculating) {
-          resetJobsDependingOnResults(curJob);
+          ResetJobsDependingOnResults(curJob);
         }
       }