Changeset 4810 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs

Timestamp:

11/16/10 14:31:52 (13 years ago)

Author:

cneumuel

Message:

#1260

• changed dependency discovery machanism: now all locally loaded plugins will be dependencies for a job.
• fixed logging of slaveconsole by limiting the maximum log-messages
• minor bug fixes.

File:

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

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

@@ -28 +28 @@
 using HeuristicLab.Hive.JobBase;
 using HeuristicLab.Hive.Slave.Common;
+using HeuristicLab.Persistence.Core;
 
 namespace HeuristicLab.Hive.Slave.ExecutionEngine {
@@ -49 +50 @@
     public ExecutionState ExecutionState {
       get {
-        return Job.ExecutionState;
+        return Job != null ? Job.ExecutionState : Core.ExecutionState.Stopped;
       }
     }
@@ -55 +56 @@
     public TimeSpan ExecutionTime {
       get {
-        return Job.ExecutionTime;
+        return Job != null ? Job.ExecutionTime : new TimeSpan(0, 0, 0);
       }
     }
@@ -84 +85 @@
         }
       }
-      catch (OutOfMemoryException e) {
+      catch (Exception e) {
         this.currentException = e;
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobFailed, JobId));
@@ -94 +95 @@
         Job.Start();
       }
-      catch (OutOfMemoryException e) {
+      catch (Exception e) {
         this.currentException = e;
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobFailed, JobId));
@@ -133 +134 @@
           CoresNeeded = 1,
           MemoryNeeded = 0,
-          PluginsNeeded = HivePluginInfoDto.FindPluginsNeeded(e.Value.GetType()),
+          PluginsNeeded = HivePluginInfoDto.FindPluginsNeeded(e.Value),
         },
         SerializedJobData = jobByteArray
@@ -164 +165 @@
       HeuristicLab.Common.EventArgs<Exception> ex = (HeuristicLab.Common.EventArgs<Exception>)e;
       currentException = ex.Value;
-      Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.FinishedJob, JobId));
+      Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobFailed, JobId));
     }
 
@@ -193 +194 @@
 
     public byte[] GetFinishedJob() {
-      //Job isn't finished!
+      if (Job == null)
+        return new byte[0];
+
       if (Job.ExecutionState == Core.ExecutionState.Started) {
-        throw new InvalidStateException("Job is still running");
-      } else {
-        byte[] jobArr = SerializedJob.Serialize(Job);
-        return jobArr;
+        throw new InvalidStateException("Job is still running"); //Job isn't finished!
+      } else {
+        return SerializedJob.Serialize(Job);
       }
     }
@@ -208 +210 @@
 
     private void RestoreJobObject(byte[] sjob) {
-      Job = SerializedJob.Deserialize<IJob>(sjob);
+      try {
+        Job = SerializedJob.Deserialize<IJob>(sjob);
+      }
+      catch {
+        Job = null;
+      }
     }
 
@@ -216 +223 @@
 
     public void Dispose() {
-      DeregisterJobEvents();
+      if(Job != null)
+        DeregisterJobEvents();
       Queue = null;
       Job = null;