Changeset 5511 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

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.Clients.Hive/3.4/ExperimentManager

Files:

• HiveExperimentClient.cs (modified) (4 diffs)
• HiveJobClient.cs (modified) (6 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
+using HeuristicLab.Clients.Common;
+using HeuristicLab.Clients.Hive.Jobs;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
+using HeuristicLab.Services.Hive.Common;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using HeuristicLab.Tracing;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Clients.Hive.Jobs;
-using HeuristicLab.Clients.Common;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Clients.Hive {
+  using System.Configuration;
+  using System.IO;
+  using HeuristicLab.PluginInfrastructure;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.PluginInfrastructure;
-  using System.IO;
-  using System.Configuration;
-  using System.Reflection;
-  using HeuristicLab.PluginInfrastructure.Manager;
 
   /// <summary>
@@ -301 +299 @@
     private static Plugin UploadConfigurationFile(IHiveService service) {
       string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
-      string configFileName = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
+      string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
 
       Plugin configPlugin = new Plugin() {
@@ -331 +329 @@
       if (hiveJob.OptimizerJob.ComputeInParallel &&
         (hiveJob.OptimizerJob.Optimizer is Optimization.Experiment || hiveJob.OptimizerJob.Optimizer is Optimization.BatchRun)) {
-        hiveJob.Job.JobState = JobState.WaitingForChildJobs;
+        hiveJob.Job.SetState(JobState.FinishOnChildJobsFinished);
         hiveJob.OptimizerJob.CollectChildJobs = false; // don't collect child-jobs on slaves
         jobData = hiveJob.GetAsJobData(true, out plugins);
@@ -522 +520 @@
         if (hj != null) {
           hj.UpdateFromLightweightJob(lightweightJob);
-          if ((hj.Job.JobState == JobState.Aborted ||
-               hj.Job.JobState == JobState.Failed ||
-               hj.Job.JobState == JobState.Finished) &&
+          if ((hj.Job.State == JobState.Aborted ||
+               hj.Job.State == JobState.Failed ||
+               hj.Job.State == JobState.Finished) &&
               !hj.IsFinishedOptimizerDownloaded) {
             LogMessage(hj.Job.Id, "Downloading optimizer for job");

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Clients.Hive.Jobs;
@@ -32 +31 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab.Clients.Hive {
@@ -45 +43 @@
           return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         } else {
-          if (job.JobState == JobState.Waiting) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-          else if (job.JobState == JobState.WaitingForChildJobs) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-          else if (job.JobState == JobState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-          else if (job.JobState == JobState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-          else if (job.JobState == JobState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
-          else if (job.JobState == JobState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          if (job.State == JobState.Waiting) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (job.State == JobState.FinishOnChildJobsFinished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (job.State == JobState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
+          else if (job.State == JobState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          else if (job.State == JobState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
+          else if (job.State == JobState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
           else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         }
@@ -108 +106 @@
     public HiveJob() {
       this.Job = new Job() {
-        JobState = JobState.Offline,
-        DateCreated = DateTime.Now,
         CoresNeeded = 1,
         MemoryNeeded = 0
       };
+      job.SetState(JobState.Offline);
       this.childHiveJobs = new ItemList<HiveJob>();
       syncJobsWithOptimizers = true;
@@ -406 +403 @@
       if (lightweightJob != null) {
         job.Id = lightweightJob.Id;
-        job.DateCreated = lightweightJob.DateCreated;
-        job.DateCalculated = lightweightJob.DateCalculated;
-        job.DateFinished = lightweightJob.DateFinished;
-        job.Exception = lightweightJob.Exception;
         job.Id = lightweightJob.Id;
         job.ExecutionTime = lightweightJob.ExecutionTime;
-        job.JobState = lightweightJob.JobState;
+        job.StateLog = new List<StateLog>(lightweightJob.StateLog);
         // what about parentJob
         OnJobStateChanged();
@@ -488 +481 @@
     public event EventHandler JobStateChanged;
     private void OnJobStateChanged() {
-      LogMessage("JobStateChanged (State: " + this.Job.JobState + ", ExecutionTime: " + this.Job.ExecutionTime.ToString() + ")");
+      LogMessage("JobStateChanged (State: " + this.Job.State + ", ExecutionTime: " + this.Job.ExecutionTime.ToString() + ")");
       EventHandler handler = JobStateChanged;
       if (handler != null) handler(this, EventArgs.Empty);