Changeset 6200

Timestamp:

05/16/11 00:18:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• stability improvements for HiveEngine

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/RefreshableHiveExperimentView.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.4/Exceptions/HiveException.cs (added)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/ConcurrentJobDownloader.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/ExperimentManagerClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJob.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/RefreshableHiveExperiment.cs (modified) (15 diffs)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/Jobs/EngineJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/Progress/Progress.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveItemCollection.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/JobData.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/MessageContainer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/OperationJob.cs (deleted)
• HeuristicLab.Hive 3.4.sln (modified) (4 diffs)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (11 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.cs

@@ -46 +46 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.JobItemChanged += new EventHandler(Content_JobItemChanged);
+      Content.ItemJobChanged += new EventHandler(Content_JobItemChanged);
       Content.JobChanged += new EventHandler(Content_JobChanged);
       Content.JobStateChanged += new EventHandler(Content_JobStateChanged);
@@ -52 +52 @@
 
     protected override void DeregisterContentEvents() {
-      Content.JobItemChanged -= new EventHandler(Content_JobItemChanged);
+      Content.ItemJobChanged -= new EventHandler(Content_JobItemChanged);
       Content.JobChanged -= new EventHandler(Content_JobChanged);
       Content.JobStateChanged -= new EventHandler(Content_JobStateChanged);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/RefreshableHiveExperimentView.cs

@@ -21 +21 @@
 
 using System;
-using System.ComponentModel;
 using System.Linq;
 using System.Threading;
@@ -58 +57 @@
       base.RegisterContentEvents();
       Content.RefreshAutomaticallyChanged += new EventHandler(Content_RefreshAutomaticallyChanged);
-      Content.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
       Content.HiveExperimentChanged += new EventHandler(Content_HiveExperimentChanged);
       Content.IsControllableChanged += new EventHandler(Content_IsControllableChanged);
-    }
+      Content.JobStatisticsChanged += new EventHandler(Content_JobStatisticsChanged);
+    }
+
     protected override void DeregisterContentEvents() {
       Content.RefreshAutomaticallyChanged -= new EventHandler(Content_RefreshAutomaticallyChanged);
-      Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
       Content.HiveExperimentChanged -= new EventHandler(Content_HiveExperimentChanged);
       Content.IsControllableChanged -= new EventHandler(Content_IsControllableChanged);
+      Content.JobStatisticsChanged -= new EventHandler(Content_JobStatisticsChanged);
       base.DeregisterContentEvents();
     }
@@ -104 +104 @@
         //includeJobsCheckBox.Checked = false;
         refreshAutomaticallyCheckBox.Checked = false;
-        jobsTextBox.Text = "0";
-        calculatingTextBox.Text = "0";
-        finishedTextBox.Text = "0";
         logView.Content = null;
       } else {
@@ -115 +112 @@
         //includeJobsCheckBox.Checked = Content.IncludeJobs;
         refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
-        jobsTextBox.Text = Content.HiveExperiment.JobCount.ToString();
-        calculatingTextBox.Text = Content.HiveExperiment.CalculatingCount.ToString();
-        finishedTextBox.Text = Content.HiveExperiment.FinishedCount.ToString();
         logView.Content = Content.Log;
       }
+      Content_JobStatisticsChanged(this, EventArgs.Empty);
       Content_HiveExperimentChanged(this, EventArgs.Empty);
       Content_HiveJobChanged(this, EventArgs.Empty);
@@ -233 +228 @@
     }
 
-    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if (InvokeRequired)
-        Invoke(new PropertyChangedEventHandler(Content_PropertyChanged), sender, e);
-      else {
-        jobsTextBox.Text = Content.HiveExperiment.JobCount.ToString();
-        calculatingTextBox.Text = Content.HiveExperiment.CalculatingCount.ToString();
-        finishedTextBox.Text = Content.HiveExperiment.FinishedCount.ToString();
-      }
-    }
-
     private void Content_HiveExperimentChanged(object sender, EventArgs e) {
       if (Content.HiveExperiment != null) {
@@ -252 +237 @@
       SetEnabledStateOfControls();
     }
+    private void Content_JobStatisticsChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_JobStatisticsChanged), sender, e);
+      else {
+        if (Content != null) {
+          jobsTextBox.Text = Content.HiveExperiment.JobCount.ToString();
+          calculatingTextBox.Text = Content.HiveExperiment.CalculatingCount.ToString();
+          finishedTextBox.Text = Content.HiveExperiment.FinishedCount.ToString();
+        } else {
+          jobsTextBox.Text = "0";
+          calculatingTextBox.Text = "0";
+          finishedTextBox.Text = "0";
+        }
+      }
+    }
     #endregion
 
     #region Control events
     private void startButton_Click(object sender, EventArgs e) {
-      ExperimentManagerClient.StartExperiment(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex)), Content);
+      ExperimentManagerClient.StartExperiment((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex), Content);
     }
     private void pauseButton_Click(object sender, EventArgs e) {

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

@@ -21 +21 @@
 
     public void DownloadJob(Job job, Action<Job, T, Exception> onFinishedAction) {
-      Task<JobData>.Factory.StartNew((x) => DownloadJob(x), job.Id)
-                                     .ContinueWith((x) => DeserializeJob(x.Result))
-                                     .ContinueWith((x) => OnJobFinished(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously);
+      Task<T> task = Task<JobData>.Factory.StartNew((x) => DownloadJob(x), job.Id)
+                                     .ContinueWith((x) => DeserializeJob(x.Result));
+      task.ContinueWith((x) => OnJobFinished(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion);
+      task.ContinueWith((x) => OnJobFailed(job, x, onFinishedAction), TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnFaulted);
     }
 
     private void OnJobFinished(Job job, Task<T> task, Action<Job, T, Exception> onFinishedAction) {
-      onFinishedAction(job, task.Result, task.Exception);
+      onFinishedAction(job, task.Result, null);
+    }
+    private void OnJobFailed(Job job, Task<T> task, Action<Job, T, Exception> onFinishedAction) {
+      onFinishedAction(job, task.Result, task.Exception.Flatten());
     }
 

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

@@ -239 +239 @@
       }
     }
-
+    
     /// <summary>
     /// Uploads the local configuration file as plugin
@@ -286 +286 @@
       }
 
-      hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
+      TryAndRepeat(() => {
+        hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
+      }, -1, "Failed to upload plugins");
       hiveJob.Job.PluginsNeededIds.Add(configPluginId);
       hiveJob.Job.HiveExperimentId = hiveExperimentId;
@@ -293 +295 @@
       progress.ProgressValue = (double)jobCount / totalJobCount;
 
-      if (parentHiveJob != null) {
-        hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, jobData);
-      } else {
-        hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, groups.ToList());
-      }
+
+      TryAndRepeat(() => {
+        if (parentHiveJob != null) {
+          hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, jobData);
+        } else {
+          hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, groups.ToList());
+        }
+      }, -1, "Failed to add job");
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
@@ -382 +387 @@
       }
     }
+
+    /// <summary>
+    /// Executes the action. If it throws an exception it is repeated until repetition-count is reached.
+    /// If repetitions is -1, it is repeated infinitely.
+    /// </summary>
+    public static void TryAndRepeat(Action action, int repetitions, string errorMessage) {
+      try { action(); }
+      catch (Exception e) {
+        repetitions--;
+        if (repetitions == 0)
+          throw new HiveException(errorMessage, e);
+        TryAndRepeat(action, repetitions, errorMessage);
+      }
+    }
   }
 }

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

@@ -86 +86 @@
           itemJob = value;
           RegisterItemJobEvents();
-          OnJobItemChanged();
+          OnItemJobChanged();
           IsFinishedJobDownloaded = true;
         }
@@ -166 +166 @@
     protected virtual void RegisterItemJobEvents() {
       if (ItemJob != null) {
-        ItemJob.ComputeInParallelChanged += new EventHandler(JobItem_ComputeInParallelChanged);
-        ItemJob.ToStringChanged += new EventHandler(JobItem_ToStringChanged);
+        ItemJob.ComputeInParallelChanged += new EventHandler(ItemJob_ComputeInParallelChanged);
+        ItemJob.ToStringChanged += new EventHandler(ItemJob_ToStringChanged);
       }
     }
     protected virtual void DergisterItemJobEvents() {
       if (ItemJob != null) {
-        ItemJob.ComputeInParallelChanged -= new EventHandler(JobItem_ComputeInParallelChanged);
-        ItemJob.ToStringChanged -= new EventHandler(JobItem_ToStringChanged);
+        ItemJob.ComputeInParallelChanged -= new EventHandler(ItemJob_ComputeInParallelChanged);
+        ItemJob.ToStringChanged -= new EventHandler(ItemJob_ToStringChanged);
       }
     }
@@ -188 +188 @@
     }
 
-    protected virtual void JobItem_ToStringChanged(object sender, EventArgs e) {
+    protected virtual void ItemJob_ToStringChanged(object sender, EventArgs e) {
       this.OnToStringChanged();
     }
 
-    protected virtual void JobItem_ComputeInParallelChanged(object sender, EventArgs e) {
+    protected virtual void ItemJob_ComputeInParallelChanged(object sender, EventArgs e) {
       if (ItemJob != null && syncJobsWithOptimizers) {
         this.UpdateChildHiveJobs();
@@ -203 +203 @@
 
     public override string ToString() {
-      if (itemJob != null) {
+      if (itemJob != null && itemJob.Item != null) {
         return itemJob.ToString();
       } else {
-        return base.ToString();
+        return Job.Id.ToString();
       }
     }
@@ -262 +262 @@
     }
 
-    public event EventHandler JobItemChanged;
-    private void OnJobItemChanged() {
-      JobItem_ComputeInParallelChanged(this, EventArgs.Empty);
-      var handler = JobItemChanged;
+    public event EventHandler ItemJobChanged;
+    private void OnItemJobChanged() {
+      ItemJob_ComputeInParallelChanged(this, EventArgs.Empty);
+      var handler = ItemJobChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -410 +410 @@
     public virtual void IntegrateChild(ItemJob job, Guid childJobId) { }
 
+    /// <summary>
+    /// Delete ItemJob
+    /// </summary>
+    public void ClearData() {
+      this.ItemJob.Item = null;
+    }
   }
 

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

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Hive;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-  [StorableClass]
   public class RefreshableHiveExperiment : IHiveItem, IDeepCloneable, IContent, IProgressReporter {
     private JobResultPoller jobResultPoller;
@@ -37 +35 @@
     private static object locker = new object();
 
-    [Storable]
     private HiveExperiment hiveExperiment;
     public HiveExperiment HiveExperiment {
@@ -55 +52 @@
 
     /** include jobs when refreshing **/
-    [Storable]
     private bool includeJobs;
     public bool IncludeJobs {
@@ -62 +58 @@
     }
 
-    [Storable]
     private bool refreshAutomatically;
     public bool RefreshAutomatically {
@@ -83 +78 @@
     }
 
-    [Storable]
     private bool isControllable = true;
     public bool IsControllable {
@@ -95 +89 @@
     }
 
-    [Storable]
     private ILog log;
     public ILog Log {
@@ -120 +113 @@
       cloner.RegisterClonedObject(original, this);
       this.HiveExperiment = original.HiveExperiment;
-      this.RefreshAutomatically = original.RefreshAutomatically;
       this.IncludeJobs = original.IncludeJobs;
       this.IsControllable = original.IsControllable;
       this.Log = cloner.Clone(original.Log);
+      this.RefreshAutomatically = false; // do not start results polling automatically
     }
     public IDeepCloneable Clone(Cloner cloner) {
@@ -196 +189 @@
 
               if (exception != null) {
-                var ex = new ConcurrentJobDownloaderException("Downloading job failed.", exception);
+                var ex = new ConcurrentJobDownloaderException("Downloading job failed", exception);
                 LogException(ex);
                 localHiveJob.IsDownloading = false;
@@ -206 +199 @@
               } else {
                 // if the job is paused, download but don't integrate into parent optimizer (to avoid Prepare)
-
 
                 if (localJob.State == JobState.Paused) {
@@ -231 +223 @@
       }
       UpdateTotalExecutionTime();
-      UpdateStats();
+      UpdateStatistics();
     }
 
@@ -237 +229 @@
     private void LogException(Exception exception) {
       lock (logLocker) {
-        log.LogException(exception);
+        this.log.LogException(exception);
       }
     }
@@ -243 +235 @@
     private void LogMessage(string message) {
       lock (logLocker) {
-        log.LogMessage(message);
+        this.log.LogMessage(message);
       }
     }
@@ -256 +248 @@
     }
 
-    private void UpdateStats() {
+    private void UpdateStatistics() {
       var jobs = hiveExperiment.GetAllHiveJobs();
       hiveExperiment.JobCount = jobs.Count();
       hiveExperiment.CalculatingCount = jobs.Count(j => j.Job.State == JobState.Calculating);
       hiveExperiment.FinishedCount = jobs.Count(j => j.Job.State == JobState.Finished);
+      OnJobStatisticsChanged();
     }
 
@@ -269 +262 @@
                                                    && j.IsFinishedJobDownloaded);
     }
-
-    //public bool AllJobsFinishedAndDownloaded() {
-    //  return this.AllJobsFinished() && hiveExperiment.GetAllHiveJobs().All(j => j.JobItem.;
-    //}
 
     private void jobResultPoller_ExceptionOccured(object sender, EventArgs<Exception> e) {
@@ -359 +348 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    public event EventHandler JobStatisticsChanged;
+    private void OnJobStatisticsChanged() {
+      var handler = JobStatisticsChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -123 +123 @@
     <Compile Include="ExperimentManager\EngineHiveJob.cs" />
     <Compile Include="ExperimentManager\ExperimentManagerClient.cs" />
+    <Compile Include="Exceptions\HiveException.cs" />
     <Compile Include="ExperimentManager\HiveJobDownloader.cs" />
     <Compile Include="ExperimentManager\ConcurrentJobDownloaderException.cs" />
@@ -155 +156 @@
     <Compile Include="ServiceClients\HiveItem.cs" />
     <Compile Include="ServiceClients\JobData.cs" />
-    <Compile Include="ServiceClients\OperationJob.cs" />
     <Compile Include="ExperimentManager\RefreshableHiveExperiment.cs" />
     <Compile Include="ServiceClients\Plugin.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/EngineJob.cs

@@ -129 +129 @@
 
     public override string Name {
-      get { return Item.ToString(); }
+      get { return Item != null ? Item.ToString() : null; }
       set { throw new NotSupportedException(); }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Progress/Progress.cs

@@ -64 +64 @@
     private void OnFinished() {
       var handler = Finished;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      }
+      catch (Exception) { }
     }
 
@@ -70 +73 @@
     private void OnStatusChanged() {
       var handler = StatusChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      }
+      catch (Exception) { }
     }
 
@@ -76 +82 @@
     private void OnProgressChanged() {
       var handler = ProgressValueChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      }
+      catch (Exception) { }
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-  [StorableClass]
   public partial class HiveExperiment : IDeepCloneable, IContent, IProgressReporter {
-    [Storable]
     private bool useLocalPlugins;
     public bool UseLocalPlugins {
@@ -38 +35 @@
     }
 
-    [Storable]
     private ExecutionState executionState;
     public ExecutionState ExecutionState {
@@ -50 +46 @@
     }
 
-    [Storable]
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
@@ -62 +57 @@
     }
 
-    [Storable]
     private ItemCollection<HiveJob> hiveJobs;
     public ItemCollection<HiveJob> HiveJobs {
@@ -74 +68 @@
     }
 
-    [Storable]
     private bool isProgressing;
     public bool IsProgressing {
@@ -86 +79 @@
     }
 
-    [Storable]
     private IProgress progress;
     public IProgress Progress {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveItem.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Clients.Hive {
-
   public partial class HiveItem : IHiveItem {
     public string ItemName {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveItemCollection.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.Clients.Hive {
-  [Item("HiveItem Collection", "Represents a collection of OKB items.")]
+  [Item("HiveItem Collection", "Represents a collection of Hive items.")]
   public class HiveItemCollection<T> : ItemCollection<T> where T : class, IHiveItem {
     protected HiveItemCollection(HiveItemCollection<T> original, Cloner cloner) : base(original, cloner) { }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/JobData.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Clients.Hive {
-
   public partial class JobData : IDeepCloneable, IContent {
     public JobData() { }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/MessageContainer.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-  [StorableClass]
   public partial class MessageContainer : IDeepCloneable, IContent {
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

@@ -276 +276 @@
     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.ActiveCfg = Debug|x86
     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.Build.0 = Debug|x86
-    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.ActiveCfg = Release|x86
+    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.Build.0 = Release|Any CPU
     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Mixed Platforms.ActiveCfg = Release|x86
     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -290 +291 @@
     {28711372-0255-4883-9BED-81E150D73880}.Debug|x86.Build.0 = Debug
     {28711372-0255-4883-9BED-81E150D73880}.Release|Any CPU.ActiveCfg = Release
+    {28711372-0255-4883-9BED-81E150D73880}.Release|Any CPU.Build.0 = Release
     {28711372-0255-4883-9BED-81E150D73880}.Release|Mixed Platforms.ActiveCfg = Release
     {28711372-0255-4883-9BED-81E150D73880}.Release|x64.ActiveCfg = Release
@@ -301 +303 @@
     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.ActiveCfg = Debug|x86
     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.Build.0 = Debug|x86
-    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.ActiveCfg = Release|x86
+    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.Build.0 = Release|Any CPU
     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Mixed Platforms.ActiveCfg = Release|x86
     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -397 +400 @@
     {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|x86.ActiveCfg = Debug|x86
     {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|x86.Build.0 = Debug|x86
-    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Any CPU.ActiveCfg = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Any CPU.Build.0 = Release|Any CPU
     {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Mixed Platforms.ActiveCfg = Release|x86
     {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Mixed Platforms.Build.0 = Release|x86

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -7 +7 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.HiveEngine {
@@ -18 +16 @@
   [Item("Hive Engine", "Engine for parallel execution on the hive. You need enable `Parallel` for at least one operator in your operator graph to have all childoperations parallelized. Also those childoperations must not have sideeffects on a higher scope.")]
   public class HiveEngine : Engine {
-    private Semaphore maxConcurrentConnections = new Semaphore(4, 4); // avoid too many connections
-    private Semaphore maxSerializedJobsInMemory = new Semaphore(4, 4); // avoid memory problems
+    private static object logLocker = new object();
     private CancellationToken cancellationToken;
-
+    
     [Storable]
     private IOperator currentOperator;
@@ -54 +51 @@
     }
 
-    [Storable]
-    private ItemCollection<RefreshableHiveExperiment> hiveExperiments;
+    // [Storable] -> HiveExperiment can't be storable, so RefreshableHiveExperiment can't be stored
+    private ItemCollection<RefreshableHiveExperiment> hiveExperiments = new ItemCollection<RefreshableHiveExperiment>();
     public ItemCollection<RefreshableHiveExperiment> HiveExperiments {
       get { return hiveExperiments; }
@@ -76 +73 @@
     public HiveEngine() {
       ResourceNames = "HEAL";
-      HiveExperiments = new ItemCollection<RefreshableHiveExperiment>();
       Priority = 0;
     }
@@ -89 +85 @@
       this.executionTimeOnHive = original.executionTimeOnHive;
       this.useLocalPlugins = original.useLocalPlugins;
+      this.hiveExperiments = cloner.Clone(original.hiveExperiments);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -202 +199 @@
       target.SubScopes.AddRange(source.SubScopes);
       // TODO: validate if parent scopes match - otherwise source is invalid
-    }
-
-    // testfunction:
-    private IScope[] ExecuteLocally(EngineJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
-      IScope[] scopes = new Scope[jobs.Length];
-      for (int i = 0; i < jobs.Length; i++) {
-        var serialized = PersistenceUtil.Serialize(jobs[i]);
-        var deserialized = PersistenceUtil.Deserialize<IJob>(serialized);
-        deserialized.Start();
-        while (deserialized.ExecutionState != ExecutionState.Stopped) {
-          Thread.Sleep(100);
-        }
-        var serialized2 = PersistenceUtil.Serialize(deserialized);
-        var deserialized2 = PersistenceUtil.Deserialize<EngineJob>(serialized2);
-        var newScope = ((IAtomicOperation)deserialized2.InitialOperation).Scope;
-        scopes[i] = newScope;
-      }
-      return scopes;
     }
 
@@ -256 +235 @@
             random.Reset(random.Next());
         }
-        ExperimentManagerClient.StartExperiment((e) => { throw e; }, refreshableHiveExperiment);
+        ExperimentManagerClient.StartExperiment((e) => {
+          LogException(e);
+        }, refreshableHiveExperiment);
+
         // do polling until experiment is finished and all jobs are downloaded
         while (!refreshableHiveExperiment.AllJobsFinished()) {
@@ -273 +255 @@
         refreshableHiveExperiment.RefreshAutomatically = false;
         DeleteHiveExperiment(hiveExperiment.Id);
+        ClearData(refreshableHiveExperiment);
         return scopes;
       }
@@ -290 +273 @@
     }
 
+    private void ClearData(RefreshableHiveExperiment refreshableHiveExperiment) {
+      var jobs = refreshableHiveExperiment.HiveExperiment.GetAllHiveJobs();
+      foreach (var job in jobs) {
+        job.ClearData();
+      }
+    }
+
     private void DeleteHiveExperiment(Guid hiveExperimentId) {
-      TryAndRepeat(() => {
+      ExperimentManagerClient.TryAndRepeat(() => {
         ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(hiveExperimentId));
       }, 5, string.Format("Could not delete jobs"));
     }
-
-    private static object locker = new object();
-    private Job UploadJob(object keyValuePairObj, IScope parentScopeClone, CancellationToken cancellationToken, List<Guid> resourceIds, Guid hiveExperimentId) {
-      var keyValuePair = (KeyValuePair<int, EngineJob>)keyValuePairObj;
-      Job job = new Job();
-
-      try {
-        maxSerializedJobsInMemory.WaitOne();
-        JobData jobData = new JobData();
-        IEnumerable<Type> usedTypes;
-
-        // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems
-        lock (locker) {
-          ((IAtomicOperation)keyValuePair.Value.InitialOperation).Scope.Parent = parentScopeClone;
-          keyValuePair.Value.InitialOperation = (IOperation)keyValuePair.Value.InitialOperation.Clone();
-          if (keyValuePair.Value.InitialOperation is IAtomicOperation)
-            ((IAtomicOperation)keyValuePair.Value.InitialOperation).Scope.ClearParentScopes();
-          jobData.Data = PersistenceUtil.Serialize(keyValuePair.Value, out usedTypes);
-        }
-        var neededPlugins = new List<IPluginDescription>();
-
-        bool useAllLocalPlugins = true;
-        if (useAllLocalPlugins) {
-          // use all plugins
-          neededPlugins.AddRange(ApplicationManager.Manager.Plugins);
-        } else {
-          // use only 
-          PluginUtil.CollectDeclaringPlugins(neededPlugins, usedTypes);
-        }
-
-        job.CoresNeeded = 1;
-        job.PluginsNeededIds = ServiceLocator.Instance.CallHiveService(s => PluginUtil.GetPluginDependencies(s, this.OnlinePlugins, this.AlreadyUploadedPlugins, neededPlugins, useLocalPlugins));
-        job.Priority = priority;
-        job.HiveExperimentId = hiveExperimentId;
-
-        try {
-          maxConcurrentConnections.WaitOne();
-          while (job.Id == Guid.Empty) { // repeat until success
-            cancellationToken.ThrowIfCancellationRequested();
-            try {
-              job.Id = ServiceLocator.Instance.CallHiveService(s => s.AddJob(job, jobData, resourceIds));
-            }
-            catch (Exception e) {
-              LogException(e);
-              LogMessage("Repeating upload");
-            }
-          }
-        }
-        finally {
-          maxConcurrentConnections.Release();
-        }
-      }
-      finally {
-        maxSerializedJobsInMemory.Release();
-      }
-      return job;
-    }
-
+    
     private List<Guid> GetResourceIds() {
       return ServiceLocator.Instance.CallHiveService(service => {
@@ -368 +301 @@
     }
 
-    private EngineJob DownloadJob(IDictionary<Guid, int> jobIndices, object jobIdObj, CancellationToken cancellationToken) {
-      Guid jobId = (Guid)jobIdObj;
-      JobData jobData = null;
-      EngineJob engineJob = null;
-      try {
-        maxSerializedJobsInMemory.WaitOne();
-        maxConcurrentConnections.WaitOne();
-        while (jobData == null) { // repeat until success
-          cancellationToken.ThrowIfCancellationRequested();
-          try {
-            jobData = ServiceLocator.Instance.CallHiveService(s => s.GetJobData(jobId));
-          }
-          catch (Exception e) {
-            LogException(e);
-            LogMessage("Repeating download");
-          }
-        }
-        engineJob = PersistenceUtil.Deserialize<EngineJob>(jobData.Data);
-        jobData = null;
-        LogMessage(string.Format("Downloaded job #{0}", jobIndices[jobId] + 1, jobId));
-      }
-      finally {
-        maxConcurrentConnections.Release();
-        maxSerializedJobsInMemory.Release();
-      }
-      return engineJob;
-    }
-
     /// <summary>
     /// Threadsafe message logging
     /// </summary>
     private void LogMessage(string message) {
-      lock (Log) {
+      lock (logLocker) {
         Log.LogMessage(message);
       }
@@ -409 +314 @@
     /// </summary>
     private void LogException(Exception exception) {
-      lock (Log) {
+      lock (logLocker) {
         Log.LogException(exception);
       }
     }
 
-    /// <summary>
-    /// Executes the action. If it throws an exception it is repeated until repetition-count is reached.
-    /// If repetitions is -1, it is repeated infinitely.
-    /// </summary>
-    private static void TryAndRepeat(Action action, int repetitions, string errorMessage) {
-      try { action(); }
-      catch (Exception e) {
-        repetitions--;
-        if (repetitions <= 0)
-          throw new HiveEngineException(errorMessage, e);
-        TryAndRepeat(action, repetitions, errorMessage);
-      }
-    }
-  }
-
-  public static class EnumerableExtensions {
-    public static TimeSpan Sum(this IEnumerable<TimeSpan> times) {
-      return TimeSpan.FromMilliseconds(times.Select(e => e.TotalMilliseconds).Sum());
-    }
+    // testfunction:
+    //private IScope[] ExecuteLocally(EngineJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
+    //  IScope[] scopes = new Scope[jobs.Length];
+    //  for (int i = 0; i < jobs.Length; i++) {
+    //    var serialized = PersistenceUtil.Serialize(jobs[i]);
+    //    var deserialized = PersistenceUtil.Deserialize<IJob>(serialized);
+    //    deserialized.Start();
+    //    while (deserialized.ExecutionState != ExecutionState.Stopped) {
+    //      Thread.Sleep(100);
+    //    }
+    //    var serialized2 = PersistenceUtil.Serialize(deserialized);
+    //    var deserialized2 = PersistenceUtil.Deserialize<EngineJob>(serialized2);
+    //    var newScope = ((IAtomicOperation)deserialized2.InitialOperation).Scope;
+    //    scopes[i] = newScope;
+    //  }
+    //  return scopes;
+    //}
   }
 }