Changeset 6198 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/RefreshableHiveExperiment.cs

Timestamp:

05/15/11 12:02:12 (13 years ago)

Author:

cneumuel

Message:

#1233

• small fixes for HiveEngine

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/RefreshableHiveExperiment.cs (modified) (7 diffs)

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

@@ -95 +95 @@
     }
 
+    [Storable]
+    private ILog log;
+    public ILog Log {
+      get { return log; }
+      set { log = value; }
+    }
+    
+
     #region Constructors and Cloning
     public RefreshableHiveExperiment() {
@@ -100 +108 @@
       this.refreshAutomatically = true;
       this.HiveExperiment = new HiveExperiment();
+      this.log = new Log();
     }
     public RefreshableHiveExperiment(HiveExperiment hiveExperiment) {
@@ -105 +114 @@
       this.refreshAutomatically = true;
       this.HiveExperiment = hiveExperiment;
+      this.log = new Log();
     }
     protected RefreshableHiveExperiment(RefreshableHiveExperiment original, Cloner cloner) {
@@ -112 +122 @@
       this.IncludeJobs = original.IncludeJobs;
       this.IsControllable = original.IsControllable;
+      this.Log = cloner.Clone(original.Log);
     }
     public IDeepCloneable Clone(Cloner cloner) {
@@ -167 +178 @@
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightJob>> e) {
       foreach (LightweightJob lightweightJob in e.Value) {
-        HiveJob hj = GetHiveJobById(lightweightJob.Id);
-        if (hj != null) {
-          DateTime lastJobDataUpdate = hj.Job.LastJobDataUpdate;
-          hj.UpdateFromLightweightJob(lightweightJob);
-
+        HiveJob hiveJob = GetHiveJobById(lightweightJob.Id);
+        if (hiveJob != null) {
           // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
-          if (lastJobDataUpdate != DateTime.MinValue && lastJobDataUpdate < hj.Job.LastJobDataUpdate) {
-            jobDownloader.DownloadJob(hj.Job.Id, (id, itemJob, exception) => {
+          if (hiveJob.Job.State == JobState.Offline && lightweightJob.State != JobState.Finished && lightweightJob.State != JobState.Failed && lightweightJob.State != JobState.Aborted) {
+            hiveJob.Job.LastJobDataUpdate = lightweightJob.LastJobDataUpdate;
+          }
+
+          hiveJob.UpdateFromLightweightJob(lightweightJob);
+
+          if (!hiveJob.IsFinishedJobDownloaded && !hiveJob.IsDownloading && hiveJob.Job.LastJobDataUpdate < lightweightJob.LastJobDataUpdate) {
+            log.LogMessage(string.Format("Downloading job {0}", lightweightJob.Id));
+            hiveJob.IsDownloading = true;
+            jobDownloader.DownloadJob(hiveJob.Job, (localJob, itemJob, exception) => {
+              log.LogMessage(string.Format("Finished downloading job {0}", localJob.Id));
+              HiveJob localHiveJob = GetHiveJobById(localJob.Id);
+
               if (exception != null) {
+                log.LogException(exception);
+                localHiveJob.IsDownloading = false;
                 throw new ConcurrentJobDownloaderException("Downloading job failed.", exception);
               }
@@ -183 +204 @@
               } else {
                 // if the job is paused, download but don't integrate into parent optimizer (to avoid Prepare)
-                if (hj.Job.State == JobState.Paused) {
-                  hj.ItemJob = itemJob;
+
+
+                if (localJob.State == JobState.Paused) {
+                  localHiveJob.ItemJob = itemJob;
                 } else {
-                  if (lightweightJob.ParentJobId.HasValue) {
-                    HiveJob parentHiveJob = GetHiveJobById(lightweightJob.ParentJobId.Value);
-                    parentHiveJob.IntegrateChild(itemJob, hj.Job.Id);
+                  if (localJob.ParentJobId.HasValue) {
+                    HiveJob parentHiveJob = GetHiveJobById(localJob.ParentJobId.Value);
+                    parentHiveJob.IntegrateChild(itemJob, localJob.Id);
                   } else {
-                    hj.ItemJob = itemJob;
+                    localHiveJob.ItemJob = itemJob;
                   }
                 }
+                localHiveJob.IsDownloading = false;
+                localHiveJob.Job.LastJobDataUpdate = localJob.LastJobDataUpdate;
               }
             });
@@ -227 +252 @@
                                                    || j.Job.State == JobState.Aborted
                                                    || j.Job.State == JobState.Failed)
-                                                   && j.ItemJobDownloaded);
+                                                   && j.IsFinishedJobDownloaded);
     }