Changeset 5000 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine

Timestamp:

11/30/10 15:58:33 (14 years ago)

Author:

cneumuel

Message:

#1260

• custom configuration file is now deployed on slaves
• made plugin distribution process more robust
• fixed bug: slave assemblies are required in each sandbox appdomain
• cleaned up some configuration elements in slave console client
• fixed wrong path for locally persisted jobs

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs (modified) (5 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs

@@ -29 +29 @@
 using HeuristicLab.Hive.Slave.Common;
 using HeuristicLab.Persistence.Core;
+using System.Threading;
 
 namespace HeuristicLab.Hive.Slave.ExecutionEngine {
@@ -47 +48 @@
     }
     public MessageQueue Queue { get; set; }
-    
+
     public ExecutionState ExecutionState {
       get {
@@ -62 +63 @@
     public DateTime CreationTime { get; set; }
 
-    /// <summary>
-    /// 
-    /// </summary>
     /// <param name="serializedJob"></param>
     /// <param name="collectChildJobs">if true, all child-jobs are downloaded and the job will be resumed.</param>
@@ -198 +196 @@
 
       if (Job.ExecutionState == Core.ExecutionState.Started) {
+        try { Job.Stop(); }
+        catch { }
+      }
+
+      if (Job.ExecutionState == Core.ExecutionState.Started) {
         throw new InvalidStateException("Job is still running"); //Job isn't finished!
       } else {
@@ -223 +226 @@
 
     public void Dispose() {
-      if(Job != null)
+      if (Job != null)
         DeregisterJobEvents();
       Queue = null;