Changeset 1133

Timestamp:

01/15/09 14:53:13 (16 years ago)

Author:

msteinbi

Message:

Implementing Lifecycle Management (#453)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/BusinessObjects/JobResult.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/HiveServerMessages.resx (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/ILifecycleManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (6 diffs)
• HeuristicLab.Hive.Server.Core/ClientFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/JobManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/LifecycleManager.cs (modified) (2 diffs)

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

@@ -68 +68 @@
     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_NO_JOB_WITH_THIS_ID = "Communicator.NoJobWithThisId";
     public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
     public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
+    public static string RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED = "Communicator.JobIsNotBeenigCalculated";
+    public static string RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB = "Communicator.WrongClientForJob";
 
     public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";

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

@@ -35 +35 @@
     public Job Job { get; set; }
     [DataMember]
-    public byte[] Result { get; set; } // TODO DataStructure for Result needs to be defined
+    public byte[] Result { get; set; } 
+    [DataMember]
+    public double Percentage { get; set; }
+    [DataMember]
+    public DateTime timestamp { get; set; }
     [DataMember]
     public ClientInfo Client { get; set; }

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

@@ -229 +229 @@
     <value>User is not logged in, you must login before sending Heartbeats</value>
   </data>
+  <data name="Communicator.JobIsNotBeenigCalculated" xml:space="preserve">
+    <value>There is no client registered to calculate this job</value>
+  </data>
+  <data name="Communicator.WrongClientForJob" xml:space="preserve">
+    <value>This client is not registered to calculate this job</value>
+  </data>
 </root>

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

@@ -43 +43 @@
       long jobId, 
       byte[] result, 
+      double percentage,
       Exception exception,  
       bool finished);

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

@@ -38 +38 @@
     /// The server heartbeat
     /// </summary>
-    event EventHandler OnServerHeartbeat;
+    void RegisterHeartbeat(EventHandler handler);
+
+    /// <summary>
+    /// The startup event
+    /// </summary>
+    void RegisterStartup(EventHandler handler);
+
+    /// <summary>
+    /// The shutdown event
+    /// </summary>
+    void RegisterShutdown(EventHandler handler);
 
     /// <summary>

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

@@ -58 +58 @@
       lifecycleManager = ServiceLocator.GetLifecycleManager();
 
-      lifecycleManager.OnServerHeartbeat += 
-        new EventHandler(lifecycleManager_OnServerHeartbeat);
+      lifecycleManager.RegisterHeartbeat( 
+        new EventHandler(lifecycleManager_OnServerHeartbeat));
 
       lastHeartbeats = new Dictionary<Guid, DateTime>();
@@ -90 +90 @@
                 foreach (Job job in allJobs) {
                   if (job.Client.ClientId == client.ClientId) {
-                    // TODO check for job results
+                    List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetAll());
+                    foreach (JobResult jR in allJobResults) {
+                      JobResult lastJobResult = null;
+                      if (jR.Job != null && jR.Job.Id == job.Id) {
+                        if (lastJobResult != null) {
+
+                        }
+                      }
+                    }
+
+
                     job.Client = null;
                     job.Percentage = 0;
@@ -231 +241 @@
       long jobId, 
       byte[] result, 
+      double percentage,
       Exception exception,  
       bool finished) {
@@ -239 +250 @@
       Job job = 
         jobAdapter.GetById(jobId);
+
+      if (job.Client == null)    {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
+        return response;
+      }
+      if (job.Client.ClientId != clientId) {
+        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_JO_WITH_THIS_ID;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
         return response;
       }
@@ -249 +271 @@
         return response;
       }
+      job.SerializedJob = result;
+      job.Percentage = percentage;
+
       if (finished) {
         job.State = State.finished;
@@ -263 +288 @@
       jobResult.Job = job;
       jobResult.Result = result;
+      jobResult.Percentage = percentage;
       jobResult.Exception = exception;
 
-      jobResultAdapter.Update(jobResult);    
+      jobResultAdapter.Update(jobResult);
+      jobAdapter.Update(job);
 
       response.Success = true;

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

@@ -51 +51 @@
       long jobId,
       byte[] result,
+      double percentage, 
       Exception exception,
       bool finished) {
-      return clientCommunicator.SendJobResult(clientId, jobId, result, exception, finished);
+      return clientCommunicator.SendJobResult(clientId, jobId, result, percentage, exception, finished);
     }
 

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

@@ -33 +33 @@
 
     IJobAdapter jobAdapter;
+    ILifecycleManager lifecycleManager;
 
     #region IJobManager Members
@@ -38 +39 @@
     public JobManager() {
       jobAdapter = ServiceLocator.GetJobAdapter();
+
+      lifecycleManager = ServiceLocator.GetLifecycleManager();
+
+      lifecycleManager.RegisterStartup(new EventHandler(lifecycleManager_OnStartup));
+      lifecycleManager.RegisterStartup(new EventHandler(lifecycleManager_OnShutdown));
+    }
+
+    void checkForDeadJobs() {
+      List<Job> allJobs = new List<Job>(jobAdapter.GetAll());
+      foreach (Job curJob in allJobs) {
+        if (curJob.State == State.calculating) {
+          // TODO check for job results
+          curJob.State = State.idle;
+          curJob.Percentage = 0;
+          curJob.Client = null;
+        }
+      }
+    }
+
+    void lifecycleManager_OnStartup(object sender, EventArgs e) {
+      checkForDeadJobs();
+    }
+
+    void lifecycleManager_OnShutdown(object sender, EventArgs e) {
+      checkForDeadJobs();
     }
 

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

@@ -33 +33 @@
       new Timer();
 
+    private static event EventHandler OnServerHeartbeat;
+    private static event EventHandler OnStartup;
+    private static event EventHandler OnShutdown;
     #region ILifecycleManager Members
-    public event EventHandler OnServerHeartbeat;
 
-    public LifecycleManager() {
-      timer.Elapsed += new ElapsedEventHandler(timer_Elapsed);
+    public void RegisterHeartbeat(EventHandler handler) {
+      OnServerHeartbeat += handler;
+    }
+
+    public void RegisterStartup(EventHandler handler) {
+      OnStartup += handler;
+    }
+
+    public void RegisterShutdown(EventHandler handler) {
+      OnShutdown += handler;
     }
 
     public void Init() {
       timer.Interval = new TimeSpan(0, 0, 10).TotalMilliseconds; // TODO: global constant needed
+      timer.Elapsed += new ElapsedEventHandler(timer_Elapsed);
       timer.Start();
+
+      if (OnStartup != null)
+        OnStartup(this, null);
     }
 
@@ -56 +70 @@
     public void Shutdown() {
       ServiceLocator.GetTransactionManager().UpdateDB();
+
+      if (OnShutdown != null)
+        OnShutdown(this, null);
     }