Changeset 6419 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

Timestamp:

06/16/11 00:06:54 (13 years ago)

Author:

cneumuel

Message:

#1233

• created events when statelog changed
• fixed memory leak in hiveengine
• extended timeout for long running transactions and database contexts (when jobdata is stored)
• replaced random guids in database with sequential guids for performance reasons
• minor fixes and cleanups

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (10 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

@@ -31 +31 @@
   /// </summary>
   public class Executor : MarshalByRefObject, IDisposable {
-    public Guid JobId { get; set; }
-    private IJob Job { get; set; }
-    public int CoresNeeded { get; set; }
-    public int MemoryNeeded { get; set; }
     private bool wasJobAborted = false;
     private Semaphore pauseStopSem = new Semaphore(0, 1);
     private Semaphore startJobSem = new Semaphore(0, 1);
-    //make pause or stop wait until start is finished
-    private Semaphore jobStartedSem = new Semaphore(0, 1);
+    private Semaphore jobStartedSem = new Semaphore(0, 1); // make pause or stop wait until start is finished
     private ExecutorQueue executorQueue;
-    public ExecutorQueue ExecutorCommandQueue {
-      get {
-        return executorQueue;
-      }
-    }
+    private bool jobDataInvalid = false; // if true, the jobdata is not sent when the job is failed
+    private IJob job;
+    private DateTime creationTime;
+
+    public Guid JobId { get; set; }
+    public int CoresNeeded { get; set; }
+    public int MemoryNeeded { get; set; }
     public bool IsStopping { get; set; }
     public bool IsPausing { get; set; }
-    private DateTime CreationTime { get; set; }
+
     private Exception currentException;
     public String CurrentException {
@@ -60 +57 @@
     }
 
+    public ExecutorQueue ExecutorCommandQueue {
+      get { return executorQueue; }
+    }
+
     private ExecutionState ExecutionState {
-      get {
-        return Job != null ? Job.ExecutionState : HeuristicLab.Core.ExecutionState.Stopped;
-      }
+      get { return job != null ? job.ExecutionState : HeuristicLab.Core.ExecutionState.Stopped; }
     }
 
     public TimeSpan ExecutionTime {
-      get {
-        return Job != null ? Job.ExecutionTime : new TimeSpan(0, 0, 0);
-      }
+      get { return job != null ? job.ExecutionTime : new TimeSpan(0, 0, 0); }
     }
 
@@ -80 +77 @@
     public void Start(byte[] serializedJob) {
       try {
-        CreationTime = DateTime.Now;
-        Job = PersistenceUtil.Deserialize<IJob>(serializedJob);
+        creationTime = DateTime.Now;
+        job = PersistenceUtil.Deserialize<IJob>(serializedJob);
 
         RegisterJobEvents();
 
-        Job.Start();
-        if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(15))) {
+        job.Start();
+        if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(25))) {
+          jobDataInvalid = true;
           throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
         }
@@ -101 +99 @@
       // wait until job is started. if this does not happen, the Job is null an we give up
       jobStartedSem.WaitOne(TimeSpan.FromSeconds(15));
-      if (Job == null) {
+      if (job == null) {
         currentException = new Exception("Pausing job " + this.JobId + ": Job is null");
         return;
       }
 
-      if (Job.ExecutionState == ExecutionState.Started) {
+      if (job.ExecutionState == ExecutionState.Started) {
         try {
-          Job.Pause();
+          job.Pause();
           //we need to block the pause...
           pauseStopSem.WaitOne();
@@ -122 +120 @@
       // wait until job is started. if this does not happen, the Job is null an we give up
       jobStartedSem.WaitOne(TimeSpan.FromSeconds(15));
-      if (Job == null) {
+      if (job == null) {
         currentException = new Exception("Stopping job " + this.JobId + ": Job is null");
       }
@@ -129 +127 @@
       if ((ExecutionState == ExecutionState.Started) || (ExecutionState == ExecutionState.Paused)) {
         try {
-          Job.Stop();
+          job.Stop();
           pauseStopSem.WaitOne();
         }
@@ -139 +137 @@
 
     private void RegisterJobEvents() {
-      Job.JobStopped += new EventHandler(Job_JobStopped);
-      Job.JobFailed += new EventHandler(Job_JobFailed);
-      Job.JobPaused += new EventHandler(Job_JobPaused);
-      Job.JobStarted += new EventHandler(Job_JobStarted);
+      job.JobStopped += new EventHandler(Job_JobStopped);
+      job.JobFailed += new EventHandler(Job_JobFailed);
+      job.JobPaused += new EventHandler(Job_JobPaused);
+      job.JobStarted += new EventHandler(Job_JobStarted);
     }
 
     private void DeregisterJobEvents() {
-      Job.JobStopped -= new EventHandler(Job_JobStopped);
-      Job.JobFailed -= new EventHandler(Job_JobFailed);
-      Job.JobPaused -= new EventHandler(Job_JobPaused);
-      Job.JobStarted -= new EventHandler(Job_JobStarted);
+      job.JobStopped -= new EventHandler(Job_JobStopped);
+      job.JobFailed -= new EventHandler(Job_JobFailed);
+      job.JobPaused -= new EventHandler(Job_JobPaused);
+      job.JobStarted -= new EventHandler(Job_JobStarted);
     }
 
@@ -182 +180 @@
 
     public JobData GetJobData() {
-      if (Job.ExecutionState == ExecutionState.Started) {
+      if (jobDataInvalid) return null;
+
+      if (job.ExecutionState == ExecutionState.Started) {
         throw new InvalidStateException("Job is still running");
       } else {
         JobData jobData = new JobData();
-        if (Job == null) {
+        if (job == null) {
           //send empty job and save exception
           jobData.Data = PersistenceUtil.Serialize(new JobData());
@@ -193 +193 @@
           }
         } else {
-          jobData.Data = PersistenceUtil.Serialize(Job);
+          jobData.Data = PersistenceUtil.Serialize(job);
         }
         jobData.JobId = JobId;
@@ -201 +201 @@
 
     public void Dispose() {
-      if (Job != null)
+      if (job != null)
         DeregisterJobEvents();
-      Job = null;
+      job = null;
     }
   }