Changeset 17468

Timestamp:

03/03/20 15:42:31 (5 years ago)

Author:

jkarder

Message:

#3060: merged r17445 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB.Views (modified) (1 prop)
• HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs (modified) (1 diff)

stable/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs

@@ -223 +223 @@
 
     private async void startButton_Click(object sender, EventArgs e) {
-      await Content.StartAsync();
+      try {
+        await Content.StartAsync();
+      } catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog(this, ex);
+      }
     }
     private void pauseButton_Click(object sender, EventArgs e) {

stable/HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs

@@ -46 +46 @@
     public bool IsStopping { get; set; }
     public bool IsPausing { get; set; }
+    public bool HasFailed { get; set; }
 
     public Exception CurrentException;
@@ -84 +85 @@
 
         task.Start();
-        if (!startTaskSem.WaitOne(Settings.Default.ExecutorSemTimeouts)) {
+        if (!startTaskSem.WaitOne(Settings.Default.ExecutorSemTimeouts) && !HasFailed) {
           throw new TimeoutException("Timeout when starting the task. TaskStarted event was not fired.");
         }
@@ -159 +160 @@
     #region Task Events
     private void Task_TaskFailed(object sender, EventArgs e) {
+      HasFailed = true;
       IsStopping = true;
       EventArgs<Exception> ex = (EventArgs<Exception>)e;
       CurrentException = ex.Value;
       executorQueue.AddMessage(ExecutorMessageType.TaskFailed);
+      startTaskSem.Set(); // cancel waiting for startup
     }
 

stable/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -80 +80 @@
 
     public override async void Start() {
-      Item.Prepare(initialOperation);
-      await Item.StartAsync();
+      try {
+        Item.Prepare(initialOperation);
+        await Item.StartAsync();
+      } catch (Exception e) {
+        engine_ExceptionOccurred(Item, new EventArgs<Exception>(e));
+      }
     }
 

stable/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -101 +101 @@
         OnTaskStopped();
       } else {
-        await Item.StartAsync();
+        try {
+          await Item.StartAsync();
+        } catch (Exception e) {
+          optimizer_ExceptionOccurred(Item, new EventArgs<Exception>(e));
+        }
       }
     }

stable/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBAlgorithmView.cs

@@ -325 +325 @@
     }
     private async void startButton_Click(object sender, EventArgs e) {
-      await Content.StartAsync();
+      try {
+        await Content.StartAsync();
+      } catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog(this, ex);
+      }
     }
     private void pauseButton_Click(object sender, EventArgs e) {

stable/HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs

@@ -137 +137 @@
     #region Control events
     protected virtual async void startButton_Click(object sender, EventArgs e) {
-      await Content.StartAsync();
+      try {
+        await Content.StartAsync();
+      } catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog(this, ex);
+      }
     }
     protected virtual void pauseButton_Click(object sender, EventArgs e) {