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

Timestamp:

02/17/11 14:47:56 (14 years ago)

Author:

cneumuel

Message:

#1233

• added StateLog to log state transitions of hive jobs
• added permissions to hive experiments (in data access layer, no UI for that yet)
• extended unit tests

Location:

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

Files:

• HiveExperiment.cs (modified) (2 diffs)
• HiveExperimentPermission.cs (added)
• Job.cs (modified) (4 diffs)
• JobState.cs (modified) (2 diffs)
• LightweightJob.cs (modified) (2 diffs)
• Permission.cs (added)
• StateLog.cs (added)

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

@@ -29 +29 @@
   public class HiveExperiment : NamedHiveItem {
     [DataMember]
-    public Guid UserId { get; set; }
+    public Guid OwnerUserId { get; set; }
     [DataMember]
     public Guid RootJobId { get; set; }
@@ -36 +36 @@
     [DataMember]
     public string ResourceNames { get; set; }
+    [DataMember]
+    public DateTime? LastAccessed { get; set; }
 
     public HiveExperiment() { }
     protected HiveExperiment(HiveExperiment original, Cloner cloner) : base(original, cloner) {
       this.RootJobId = original.RootJobId;
-      this.UserId = original.UserId;
+      this.OwnerUserId = original.OwnerUserId;
       this.DateCreated = original.DateCreated;
       this.ResourceNames = original.ResourceNames;
+      this.LastAccessed = original.LastAccessed;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
 using HeuristicLab.Common;
@@ -30 +29 @@
   [Serializable]
   public class Job : LightweightJob {
-    [DataMember]
-    public Guid UserId { get; set; }
     [DataMember]
     public int Priority { get; set; }
@@ -42 +39 @@
     [DataMember]
     public DateTime? LastHeartbeat { get; set; }
-
+    
     public Job() {
       this.PluginsNeededIds = new List<Guid>();
     }
     protected Job(Job original, Cloner cloner) : base(original, cloner) {
-      this.UserId = original.UserId;
       this.Priority = original.Priority;
       this.CoresNeeded = original.CoresNeeded;
@@ -59 +55 @@
 
     public override string ToString() {
-      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", JobState, SlaveId, DateCreated, DateCalculated, CoresNeeded, MemoryNeeded);
+      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", State, CurrentStateLog.SlaveId, DateCreated, CoresNeeded, MemoryNeeded);
     }
 

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

@@ -33 +33 @@
     Waiting,
 
-        /// <summary>
+    /// <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>
-    WaitingForChildJobs,
+    ResumeOnChildJobsFinished,
+
+    /// <summary>
+    /// Job is beeing transferred
+    /// </summary>
+    Transferring,
 
     /// <summary>
@@ -72 +82 @@
     public static bool IsWaiting(this JobState jobState) {
       return jobState == JobState.Waiting ||
-        jobState == JobState.WaitingForChildJobs;
+        jobState == JobState.FinishOnChildJobsFinished;
     }
 

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.Serialization;
 using HeuristicLab.Common;
@@ -29 +31 @@
   public class LightweightJob : HiveItem {
     [DataMember]
-    public Guid? SlaveId { get; set; }
-    [DataMember]
-    public JobState JobState { get; set; }
-    [DataMember]
     public TimeSpan? ExecutionTime { get; set; }
     [DataMember]
-    public String Exception { get; set; }
+    public Guid? ParentJobId { get; set; }
     [DataMember]
-    public DateTime DateCreated { get; set; }
+    public List<StateLog> StateLog { get; set; }
     [DataMember]
-    public DateTime? DateCalculated { get; set; }
-    [DataMember]
-    public DateTime? DateFinished { get; set; }
-    [DataMember]
-    public Guid? ParentJobId { get; set; }
+    public JobState State { get; set; }
+
+    public StateLog CurrentStateLog { get { return StateLog.Last(); } }
+    public DateTime DateCreated { get { return StateLog.First().DateTime; } }
+    public DateTime? DateFinished { get { return CurrentStateLog.State == JobState.Finished ? new DateTime?(CurrentStateLog.DateTime) : null; } }
 
     public LightweightJob() {
-      JobState = DataTransfer.JobState.Offline;
+      StateLog = new List<DataTransfer.StateLog>();
     }
+
     public LightweightJob(Job job) {
-      this.SlaveId = job.SlaveId;
-      this.JobState = job.JobState;
       this.ExecutionTime = job.ExecutionTime;
-      this.Exception = job.Exception;
-      this.DateCreated = job.DateCreated;
-      this.DateCalculated = job.DateCalculated;
-      this.DateFinished = job.DateFinished;
       this.ParentJobId = job.ParentJobId;
+      this.StateLog = new List<StateLog>();
     }
-    protected LightweightJob(LightweightJob original, Cloner cloner) : base(original, cloner) {
-      this.SlaveId = original.SlaveId;
-      this.JobState = original.JobState;
+    protected LightweightJob(LightweightJob original, Cloner cloner)
+      : base(original, cloner) {
       this.ExecutionTime = original.ExecutionTime;
-      this.Exception = original.Exception;
-      this.DateCreated = original.DateCreated;
-      this.DateCalculated = original.DateCalculated;
-      this.DateFinished = original.DateFinished;
       this.ParentJobId = original.ParentJobId;
+      this.StateLog = new List<StateLog>(original.StateLog);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new LightweightJob(this, cloner);
     }
+
+    public void SetState(JobState state) {
+      this.State = state;
+      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now });
+    }
+
+    public void SetState(JobState state, Guid userId) {
+      this.State = state;
+      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, UserId = userId });
+    }
+
+    public void SetState(JobState state, Guid slaveId, string exception) {
+      this.State = state;
+      this.StateLog.Add(new StateLog() { State = state, DateTime = DateTime.Now, SlaveId = slaveId, Exception = exception });
+    }
   }
 }