Changeset 5526 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer

Timestamp:

02/21/11 17:35:42 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer

Files:

• Job.cs (modified) (2 diffs)
• JobState.cs (modified) (2 diffs)
• LightweightJob.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Job.cs

@@ -39 +39 @@
     [DataMember]
     public DateTime? LastHeartbeat { get; set; }
+    [DataMember]
+    public bool IsParentJob { get; set; }
+    [DataMember]
+    public bool FinishWhenChildJobsFinished { get; set; }
     
     public Job() {
@@ -49 +53 @@
       this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
       this.LastHeartbeat = original.LastHeartbeat;
+      this.IsParentJob = original.IsParentJob;
+      this.FinishWhenChildJobsFinished = original.FinishWhenChildJobsFinished;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/JobState.cs

@@ -33 +33 @@
     Waiting,
 
-    /// <summary>
-    /// The job is set to Finished when all child jobs are Finished.
-    /// </summary>
-    FinishOnChildJobsFinished,
+    ///// <summary>
+    ///// The job is set to Finished when all child jobs are Finished.
+    ///// </summary>
+    //FinishOnChildJobsFinished,
 
-    /// <summary>
-    /// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
-    /// </summary>
-    ResumeOnChildJobsFinished,
+    ///// <summary>
+    ///// The job is paused and waits on the server to be sent back to a Slave when all of its child jobs are Finished.
+    ///// </summary>
+    //ResumeOnChildJobsFinished,
 
     /// <summary>
@@ -81 +81 @@
     /// </summary>
     public static bool IsWaiting(this JobState jobState) {
-      return jobState == JobState.Waiting ||
-        jobState == JobState.FinishOnChildJobsFinished;
+      return jobState == JobState.Waiting;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/LightweightJob.cs

@@ -48 +48 @@
 
     public LightweightJob(Job job) {
+      this.Id = job.Id;
       this.ExecutionTime = job.ExecutionTime;
       this.ParentJobId = job.ParentJobId;
-      this.StateLog = new List<StateLog>();
+      this.StateLog = new List<StateLog>(job.StateLog);
+      this.State = job.State;
     }
     protected LightweightJob(LightweightJob original, Cloner cloner)
@@ -57 +59 @@
       this.ParentJobId = original.ParentJobId;
       this.StateLog = new List<StateLog>(original.StateLog);
+      this.State = original.State;
     }
     public override IDeepCloneable Clone(Cloner cloner) {