Changeset 6248

Timestamp:

05/23/11 11:26:27 (14 years ago)

Author:

ascheibe

Message:

#1233

• don't set job failed if JobNotFoundException is thrown
• disable AboutView for all items
• avoid NullRefException in SendFinishedJob

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.Views/3.4/AboutView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/AboutView.cs

@@ -28 +28 @@
 namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
   [View("AboutView: Show some information about HeursticLab Hive")]
-  [Content(typeof(Item), IsDefaultView = false)]
   public partial class AboutView : ItemView {
     public new Item Content {

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

@@ -150 +150 @@
               // handle exception of task
               clientCom.LogMessage(t.Exception.ToString());
-              wcfService.UpdateJobState(container.JobId, JobState.Failed, t.Exception.ToString());
-              SlaveStatusInfo.IncrementJobsFailed();
+              if (t.Exception.GetType() != typeof(JobNotFoundException)) {
+                wcfService.UpdateJobState(container.JobId, JobState.Waiting, t.Exception.ToString());
+                SlaveStatusInfo.IncrementJobsFailed();
+              }
             }, TaskContinuationOptions.OnlyOnFaulted);
             break;

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

@@ -165 +165 @@
         try {
           JobData sJob = executor.GetFinishedJob();
-          clientCom.LogMessage(string.Format("Sending the finished job with id: {0}", JobId));
-          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
+          if (sJob != null) {
+            clientCom.LogMessage(string.Format("Sending the finished job with id: {0}", JobId));
+            wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
+          }
         }
         catch (Exception e) {
@@ -210 +212 @@
       if (pluginsPrepared) {
         try {
-          appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+          appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitPrivilegedSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
           appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);