Changeset 6168 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

Timestamp:

05/09/11 14:12:10 (13 years ago)

Author:

cneumuel

Message:

#1233

• removed Job-dto objects from slave core (since it stores outdated objects)
• added command textbox to HiveJobView
• improved the way the control buttons behave in HiveJobView
• improved job control (pause and stop is also possible when job is not currently calculating)
• improved gantt chart view (last state log entry is also displayed)
• unified code for downloading jobs between experiment manager and hive engine

File:

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

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

@@ -24 +24 @@
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.ServiceModel;
 using System.Threading;
@@ -46 +47 @@
     private Dictionary<Guid, Executor> executors = new Dictionary<Guid, Executor>();
     private Dictionary<Guid, AppDomain> appDomains = new Dictionary<Guid, AppDomain>();
-    private Dictionary<Guid, Job> jobs = new Dictionary<Guid, Job>();
 
     private WcfService wcfService;
@@ -57 +57 @@
     public Dictionary<Guid, Executor> Executors {
       get { return executors; }
-    }
-
-    internal Dictionary<Guid, Job> Jobs {
-      get { return jobs; }
     }
 
@@ -163 +159 @@
               Job job = wcfService.GetJob(jobId);
               if (job == null) throw new JobNotFoundException(jobId);
-              lock (executors) {
-                if (!jobs.ContainsKey(job.Id)) {
-                  jobs.Add(job.Id, job);
-                }
-              }
               JobData jobData = wcfService.GetJobData(job.Id);
               if (jobData == null) throw new JobDataNotFoundException(jobId);
@@ -220 +211 @@
 
     private void DoPauseJob(Guid jobId) {
-      if (!Jobs.ContainsKey(jobId)) {
+      if (!executors.ContainsKey(jobId)) {
         clientCom.LogMessage("DoPauseJob: Can't find job with id " + jobId);
       } else {
-        Job job = Jobs[jobId];
-
-        if (job != null) {
+        Job job = wcfService.GetJob(jobId);
+
+        if (job != null && executors.ContainsKey(job.Id)) {
           executors[job.Id].Pause();
           JobData sJob = executors[job.Id].GetPausedJob();
@@ -251 +242 @@
 
     private void DoStopJob(Guid jobId) {
-      if (!Jobs.ContainsKey(jobId)) {
+      if (!executors.ContainsKey(jobId)) {
         clientCom.LogMessage("DoStopJob: Can't find job with id " + jobId);
       } else {
-        Job job = Jobs[jobId];
+        Job job = wcfService.GetJob(jobId);
 
         if (job != null) {
@@ -260 +251 @@
           JobData sJob = executors[job.Id].GetFinishedJob();
           job.ExecutionTime = executors[job.Id].ExecutionTime;
-
 
           try {
@@ -268 +258 @@
             SlaveStatusInfo.JobsAborted++;
 
-            clientCom.LogMessage("Sending the stoppped job with id: " + job.Id);
+            clientCom.LogMessage("Sending the stopped job with id: " + job.Id);
             wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Aborted);
           }
@@ -285 +275 @@
     /// </summary>
     private void DoAbortAll() {
-      List<Guid> guids = new List<Guid>();
-      foreach (Guid job in Jobs.Keys) {
-        guids.Add(job);
-      }
-
-      foreach (Guid g in guids) {
-        KillAppDomain(g);
-      }
-
+      List<Guid> jobIds;
+      lock (executors) {
+        jobIds = new List<Guid>(executors.Keys);
+      }
+      foreach (Guid jobId in jobIds) {
+        KillAppDomain(jobId);
+      }
       clientCom.LogMessage("Aborted all jobs!");
     }
@@ -304 +292 @@
 
       //copy guids because there will be removed items from 'Jobs'
-      List<Guid> guids = new List<Guid>();
-      foreach (Guid job in Jobs.Keys) {
-        guids.Add(job);
-      }
-
-      foreach (Guid g in guids) {
-        DoPauseJob(g);
+      List<Guid> jobIds;
+      lock (executors) {
+        jobIds = new List<Guid>(Executors.Keys);
+      }
+
+      foreach (Guid jobId in jobIds) {
+        DoPauseJob(jobId);
       }
     }
@@ -321 +309 @@
 
       //copy guids because there will be removed items from 'Jobs'
-      List<Guid> guids = new List<Guid>();
-      foreach (Guid job in Jobs.Keys) {
-        guids.Add(job);
-      }
-
-      foreach (Guid g in guids) {
-        DoStopJob(g);
+      List<Guid> jobIds;
+      lock (executors) {
+        jobIds = new List<Guid>(executors.Keys);
+      }
+
+      foreach (Guid jobId in jobIds) {
+        DoStopJob(jobId);
       }
     }
@@ -395 +383 @@
     /// </summary>
     public void PauseWaitJob(JobData data) {
-      if (!Jobs.ContainsKey(data.JobId)) {
+      if (!Executors.ContainsKey(data.JobId)) {
         clientCom.LogMessage("Can't find job with id " + data.JobId);
       } else {
-        Job job = Jobs[data.JobId];
+        Job job = wcfService.GetJob(data.JobId);
         wcfService.UpdateJobData(job, data, ConfigManager.Instance.GetClientInfo().Id, JobState.Paused);
         wcfService.UpdateJobState(job.Id, JobState.Waiting, null);
@@ -416 +404 @@
           return;
         }
-        if (!jobs.ContainsKey(jobId)) {
+        if (!executors.ContainsKey(jobId)) {
           clientCom.LogMessage("Job doesn't exist");
           return;
         }
-        Job cJob = jobs[jobId];
-        cJob.ExecutionTime = executors[jobId].ExecutionTime;
+        Job job = wcfService.GetJob(jobId);
+        job.ExecutionTime = executors[jobId].ExecutionTime;
 
         if (executors[jobId].Aborted) {
@@ -436 +424 @@
         try {
           clientCom.LogMessage("Sending the finished job with id: " + jobId);
-          wcfService.UpdateJobData(cJob, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
         }
         catch (Exception e) {
@@ -456 +444 @@
     /// A new Job from the wcfService has been received and will be started within a AppDomain.
     /// </summary>    
-    private void StartJobInAppDomain(Job myJob, JobData jobData) {
-      clientCom.LogMessage("Received new job with id " + myJob.Id);
+    private void StartJobInAppDomain(Job job, JobData jobData) {
+      clientCom.LogMessage("Received new job with id " + job.Id);
       clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
 
       lock (startInAppDomainLocker) {
-        if (executors.ContainsKey(myJob.Id)) {
-          clientCom.LogMessage("Job with key " + myJob.Id + " already exists. Job will be ignored.");
+        if (executors.ContainsKey(job.Id)) {
+          clientCom.LogMessage("Job with key " + job.Id + " already exists. Job will be ignored.");
           return;
         }
 
-        String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString());
+        String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, job.Id.ToString());
         bool pluginsPrepared = false;
         string configFileName = string.Empty;
 
         try {
-          PluginCache.Instance.PreparePlugins(myJob, out configFileName);
-          clientCom.LogMessage("Plugins fetched for job " + myJob.Id);
+          PluginCache.Instance.PreparePlugins(job, out configFileName);
+          clientCom.LogMessage("Plugins fetched for job " + job.Id);
           pluginsPrepared = true;
         }
         catch (Exception exception) {
-          clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
-          wcfService.UpdateJobState(myJob.Id, JobState.Failed, exception.ToString());
+          clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", job.Id, exception));
+          wcfService.UpdateJobState(job.Id, JobState.Failed, exception.ToString());
           SlaveStatusInfo.JobsAborted++;
-          lock (executors) {
-            if (jobs.ContainsKey(myJob.Id)) {
-              jobs.Remove(myJob.Id);
-            }
-          }
         }
 
         if (pluginsPrepared) {
           try {
-            AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+            AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
             appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
             Executor executor;
-            appDomains.Add(myJob.Id, appDomain);
+            appDomains.Add(job.Id, appDomain);
             clientCom.LogMessage("Creating AppDomain");
             executor = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
             clientCom.LogMessage("Created AppDomain");
-            executor.JobId = myJob.Id;
             executor.Core = this;
-            clientCom.LogMessage("Starting Executor for job " + myJob.Id);
+            executor.JobId = job.Id;
+            executor.CoresNeeded = job.CoresNeeded;
+            executor.MemoryNeeded = job.MemoryNeeded;
+            clientCom.LogMessage("Starting Executor for job " + job.Id);
             executor.Start(jobData.Data);
-
             lock (executors) {
-              executors.Add(myJob.Id, executor);
+              executors.Add(job.Id, executor);
             }
           }
           catch (Exception exception) {
-            clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id);
+            clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + job.Id);
             clientCom.LogMessage("Error thrown is: " + exception.ToString());
 
-            if (executors.ContainsKey(myJob.Id) && executors[myJob.Id].CurrentException != string.Empty) {
-              wcfService.UpdateJobState(myJob.Id, JobState.Failed, executors[myJob.Id].CurrentException);
+            if (executors.ContainsKey(job.Id) && executors[job.Id].CurrentException != string.Empty) {
+              wcfService.UpdateJobState(job.Id, JobState.Failed, executors[job.Id].CurrentException);
             } else {
-              wcfService.UpdateJobState(myJob.Id, JobState.Failed, exception.ToString());
+              wcfService.UpdateJobState(job.Id, JobState.Failed, exception.ToString());
             }
             SlaveStatusInfo.JobsAborted++;
 
-            KillAppDomain(myJob.Id);
+            KillAppDomain(job.Id);
           }
         }
@@ -587 +571 @@
           }
 
-          jobs.Remove(id);
           PluginCache.Instance.DeletePluginsForJob(id);
           GC.Collect();
@@ -602 +585 @@
       return null; // avoid destruction of proxy object after 5 minutes
     }
+
+    public int GetCoresNeeded() {
+      lock (executors) {
+        return executors.Sum(x => x.Value.CoresNeeded);
+      }
+    }
   }
 }