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

Timestamp:

06/06/11 18:33:03 (13 years ago)

Author:

ascheibe

Message:

#1233

• code cleanups for slave review
• added switch between privileged and unprivileged sandbox
• removed childjob management because it's not used

File:

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

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
@@ -28 +26 @@
 using HeuristicLab.Hive;
 
-
 namespace HeuristicLab.Clients.Hive.SlaveCore {
+  /// <summary>
+  /// The executor runs in the appdomain and handles the execution of an Hive job.
+  /// </summary>
   public class Executor : MarshalByRefObject, IDisposable {
     public Guid JobId { get; set; }
-    public IJob Job { get; set; }
+    private IJob Job { get; set; }
     public int CoresNeeded { get; set; }
     public int MemoryNeeded { get; set; }
     private bool wasJobAborted = false;
-    public Core Core { get; set; }
     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);
-
-    public ExecutorQueue executorQueue;
-
-    public bool SendHeartbeatForExecutor { get; set; } // Todo: get rid of??
+    private ExecutorQueue executorQueue;
+    public ExecutorQueue ExecutorCommandQueue {
+      get {
+        return executorQueue;
+      }
+    }
     public bool IsStopping { get; set; }
     public bool IsPausing { get; set; }
-
-    public DateTime CreationTime { get; set; }
-
+    private DateTime CreationTime { get; set; }
     private Exception currentException;
     public String CurrentException {
@@ -61 +60 @@
     }
 
-    public ExecutionState ExecutionState {
+    private ExecutionState ExecutionState {
       get {
         return Job != null ? Job.ExecutionState : HeuristicLab.Core.ExecutionState.Stopped;
@@ -74 +73 @@
 
     public Executor() {
-      SendHeartbeatForExecutor = true;
       IsStopping = false;
       IsPausing = false;
@@ -80 +78 @@
     }
 
-    /// <param name="serializedJob"></param>
-    /// <param name="collectChildJobs">if true, all child-jobs are downloaded and the job will be resumed.</param>
     public void Start(byte[] serializedJob) {
       try {
@@ -89 +85 @@
         RegisterJobEvents();
 
-        if (Job.CollectChildJobs) {
-          IEnumerable<JobData> childjobs = WcfService.Instance.GetChildJobs(JobId);
-          Job.Resume(childjobs.Select(j => PersistenceUtil.Deserialize<IJob>(j.Data)));
-        } else {
-          Job.Start();
-          if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(15))) {
-            throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
-          }
-          jobStartedSem.Release();
-        }
+        Job.Start();
+        if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(15))) {
+          throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
+        }
+        jobStartedSem.Release();
       }
       catch (Exception e) {
@@ -108 +99 @@
     public void Pause() {
       IsPausing = true;
-      SendHeartbeatForExecutor = false;
       // 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) {
-        currentException = new Exception("Pausing job " + this.JobId + ": Job is null"); // Todo: use more specific exception
+        currentException = new Exception("Pausing job " + this.JobId + ": Job is null");
         return;
       }
@@ -123 +113 @@
         }
         catch (Exception ex) {
-          currentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString()); // Todo: use more specific exception
+          currentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString());
         }
       }
@@ -130 +120 @@
     public void Stop() {
       IsStopping = true;
-      SendHeartbeatForExecutor = false;
       // 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) {
-        currentException = new Exception("Stopping job " + this.JobId + ": Job is null"); // Todo: use more specific exception
+        currentException = new Exception("Stopping job " + this.JobId + ": Job is null");
       }
       wasJobAborted = true;
@@ -144 +133 @@
         }
         catch (Exception ex) {
-          currentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString()); // Todo: use more specific exception
+          currentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString());
         }
       }
@@ -152 +141 @@
       Job.JobStopped += new EventHandler(Job_JobStopped);
       Job.JobFailed += new EventHandler(Job_JobFailed);
-      Job.NewChildJob += new EventHandler<EventArgs<IJob>>(Job_NewChildJob);
-      Job.WaitForChildJobs += new EventHandler(Job_WaitForChildJobs);
-      Job.DeleteChildJobs += new EventHandler(Job_DeleteChildJobs);
       Job.JobPaused += new EventHandler(Job_JobPaused);
       Job.JobStarted += new EventHandler(Job_JobStarted);
@@ -162 +148 @@
       Job.JobStopped -= new EventHandler(Job_JobStopped);
       Job.JobFailed -= new EventHandler(Job_JobFailed);
-      Job.NewChildJob -= new EventHandler<EventArgs<IJob>>(Job_NewChildJob);
-      Job.WaitForChildJobs -= new EventHandler(Job_WaitForChildJobs);
-      Job.DeleteChildJobs -= new EventHandler(Job_DeleteChildJobs);
       Job.JobPaused -= new EventHandler(Job_JobPaused);
       Job.JobStarted -= new EventHandler(Job_JobStarted);
@@ -170 +153 @@
 
     #region Job Events
-    private void Job_NewChildJob(object sender, EventArgs<IJob> e) {
-      //JobData childJobData = new JobData();
-      //IEnumerable<Type> types;
-      //childJobData.Data = PersistenceUtil.Serialize(e.Value, out types);
-      //IEnumerable<Plugin> plugins;
-      //PluginUtil.CollectDeclaringPlugins
-
-      //Job childJob = new Job();
-      //childJob.CoresNeeded = 1;
-      //childJob.MemoryNeeded = 0;
-      //childJob.PluginsNeededIds = FindPluginsNeeded(e.Value);
-
-      //ExecutorMessage msg = new ExecutorMessage(ExecutorMessageType.NewChildJob);
-      //msg.MsgData = childJobData;
-      //msg.MsgJob = childJob;
-
-      //executorQueue.AddMessage(msg);
-      
-      executorQueue.AddMessage(new JobExecutorMessage(ExecutorMessageType.NewChildJob, e.Value));
-    }
-
-    private void Job_WaitForChildJobs(object sender, EventArgs e) {
-      // Pause the job and send it back to the hive. The server will awake it when all child-jobs are finished
-      this.Job.CollectChildJobs = true;
-
-      //JobData jdata = new JobData();
-      //jdata.Data = PersistenceUtil.Serialize(Job);
-      //jdata.JobId = this.JobId;
-
-      //ExecutorMessage msg = new ExecutorMessage(ExecutorMessageType.WaitForChildJobs);
-      //msg.MsgData = jdata;
-      //executorQueue.AddMessage(msg);
-
-      executorQueue.AddMessage(new ExecutorMessage(ExecutorMessageType.WaitForChildJobs));
-    }
-
-    private void Job_DeleteChildJobs(object sender, EventArgs e) {
-      executorQueue.AddMessage(ExecutorMessageType.DeleteChildJobs);
-    }
-
     private void Job_JobFailed(object sender, EventArgs e) {
       EventArgs<Exception> ex = (EventArgs<Exception>)e;