Changeset 17468 for stable/HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs

Timestamp:

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

Author:

jkarder

Message:

#3060: merged r17445 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs (modified) (3 diffs)

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
     }