Changeset 6381

Timestamp:

06/08/11 00:04:16 (13 years ago)

Author:

cneumuel

Message:

#1233

• locking for childHiveJobs in OptimizerHiveJob avoid multi threaded access issues
• added IsPrivileged to gui
• minor changes

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Administration/3.4 (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administration/3.4/Properties (added)
• HeuristicLab.Clients.Hive.Administration/3.4/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4 (modified) (1 prop)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentListView.Designer.cs (deleted)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentListView.cs (deleted)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentManagerView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentListView.Designer.cs (added)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentListView.cs (added)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.Designer.cs (modified) (18 diffs)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Manager/JobManager.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Views/3.4/HiveJobs/ControllableHiveJobView.cs (deleted)
• HeuristicLab.Clients.Hive.Views/3.4/HiveJobs/ControllableHiveJobView.designer.cs (deleted)
• HeuristicLab.Clients.Hive.Views/3.4/HiveJobs/ControllableHiveJobView.resx (deleted)
• HeuristicLab.Clients.Hive.Views/3.4/HiveJobs/OptimizerHiveJobView.cs (added)
• HeuristicLab.Clients.Hive.Views/3.4/HiveJobs/OptimizerHiveJobView.designer.cs (added)
• HeuristicLab.Clients.Hive.Views/3.4/HiveJobs/OptimizerHiveJobView.resx (added)
• HeuristicLab.Clients.Hive/3.4/HiveClient.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive/3.4/HiveJobs/EngineHiveJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs (modified) (12 diffs)
• HeuristicLab.Clients.Hive/3.4/HiveJobs/OptimizerHiveJob.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.4/Jobs/ItemJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/RefreshableHiveExperiment.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs (modified) (3 diffs)
• HeuristicLab.Hive/3.4/IJob.cs (modified) (1 diff)
• HeuristicLab.HiveEngine.Test (deleted)
• HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.Designer.cs (modified) (5 diffs)
• HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.cs (modified) (4 diffs)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (8 diffs)
• HeuristicLab.HiveEngine/3.4/Tests (modified) (1 prop)
• HeuristicLab.HiveEngine/3.4/Tests/Program.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj

@@ -151 +151 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Views\HiveExperimentListView.cs">
+    <Compile Include="Views\RefreshableHiveExperimentListView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Views\HiveExperimentListView.Designer.cs">
-      <DependentUpon>HiveExperimentListView.cs</DependentUpon>
+    <Compile Include="Views\RefreshableHiveExperimentListView.Designer.cs">
+      <DependentUpon>RefreshableHiveExperimentListView.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\HiveExperimentManagerView.cs">

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentManagerView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveExperimentManagerView));
-      this.hiveExperimentListView = new HiveExperimentListView();
+      this.hiveExperimentListView = new RefreshableHiveExperimentListView();
       this.refreshButton = new System.Windows.Forms.Button();
       this.SuspendLayout();
@@ -86 +86 @@
     #endregion
 
-    private HiveExperimentListView hiveExperimentListView;
+    private RefreshableHiveExperimentListView hiveExperimentListView;
     private System.Windows.Forms.Button refreshButton;
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.Designer.cs

@@ -50 +50 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.jobsTabPage = new System.Windows.Forms.TabPage();
+      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveJobItemTreeView();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
@@ -73 +74 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
-      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveJobItemTreeView();
+      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
@@ -90 +91 @@
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(821, 520);
+      this.tabControl.Size = new System.Drawing.Size(717, 452);
       this.tabControl.TabIndex = 4;
       // 
@@ -98 +99 @@
       this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
       this.jobsTabPage.Name = "jobsTabPage";
-      this.jobsTabPage.Size = new System.Drawing.Size(813, 494);
+      this.jobsTabPage.Size = new System.Drawing.Size(709, 426);
       this.jobsTabPage.TabIndex = 5;
       this.jobsTabPage.Text = "Jobs";
       this.jobsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // jobsTreeView
+      // 
+      this.jobsTreeView.AllowDrop = true;
+      this.jobsTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.jobsTreeView.Caption = "ItemTree View";
+      this.jobsTreeView.Content = null;
+      this.jobsTreeView.Location = new System.Drawing.Point(2, 3);
+      this.jobsTreeView.Name = "jobsTreeView";
+      this.jobsTreeView.ReadOnly = false;
+      this.jobsTreeView.Size = new System.Drawing.Size(704, 420);
+      this.jobsTreeView.TabIndex = 0;
+      this.jobsTreeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragDrop);
+      this.jobsTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragEnter);
+      this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
       // 
       // logTabPage
@@ -128 +146 @@
       this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.startButton.Image = ((System.Drawing.Image)(resources.GetObject("startButton.Image")));
-      this.startButton.Location = new System.Drawing.Point(0, 604);
+      this.startButton.Location = new System.Drawing.Point(0, 536);
       this.startButton.Name = "startButton";
       this.startButton.Size = new System.Drawing.Size(24, 24);
@@ -140 +158 @@
       this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
-      this.stopButton.Location = new System.Drawing.Point(60, 604);
+      this.stopButton.Location = new System.Drawing.Point(60, 536);
       this.stopButton.Name = "stopButton";
       this.stopButton.Size = new System.Drawing.Size(24, 24);
@@ -153 +171 @@
       this.resetButton.Enabled = false;
       this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image")));
-      this.resetButton.Location = new System.Drawing.Point(90, 604);
+      this.resetButton.Location = new System.Drawing.Point(90, 536);
       this.resetButton.Name = "resetButton";
       this.resetButton.Size = new System.Drawing.Size(24, 24);
@@ -165 +183 @@
       this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.executionTimeLabel.AutoSize = true;
-      this.executionTimeLabel.Location = new System.Drawing.Point(595, 611);
+      this.executionTimeLabel.Location = new System.Drawing.Point(491, 543);
       this.executionTimeLabel.Name = "executionTimeLabel";
       this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
@@ -174 +192 @@
       // 
       this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.executionTimeTextBox.Location = new System.Drawing.Point(684, 608);
+      this.executionTimeTextBox.Location = new System.Drawing.Point(580, 540);
       this.executionTimeTextBox.Name = "executionTimeTextBox";
       this.executionTimeTextBox.ReadOnly = true;
@@ -185 +203 @@
       this.pauseButton.Enabled = false;
       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
-      this.pauseButton.Location = new System.Drawing.Point(30, 604);
+      this.pauseButton.Location = new System.Drawing.Point(30, 536);
       this.pauseButton.Name = "pauseButton";
       this.pauseButton.Size = new System.Drawing.Size(24, 24);
@@ -208 +226 @@
       this.resourceNamesTextBox.Location = new System.Drawing.Point(73, 53);
       this.resourceNamesTextBox.Name = "resourceNamesTextBox";
-      this.resourceNamesTextBox.Size = new System.Drawing.Size(494, 20);
+      this.resourceNamesTextBox.Size = new System.Drawing.Size(304, 20);
       this.resourceNamesTextBox.TabIndex = 14;
       this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
@@ -216 +234 @@
       this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.useLocalPluginsCheckBox.AutoSize = true;
-      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(573, 56);
+      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(469, 56);
       this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
       this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
@@ -239 +257 @@
       this.nameTextBox.Location = new System.Drawing.Point(73, 27);
       this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.Size = new System.Drawing.Size(605, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(501, 20);
       this.nameTextBox.TabIndex = 21;
       this.nameTextBox.Validated += new System.EventHandler(this.nameTextBox_Validated);
@@ -274 +292 @@
       this.infoGroupBox.Controls.Add(this.calculatingLabel);
       this.infoGroupBox.Controls.Add(this.jobsLabel);
-      this.infoGroupBox.Location = new System.Drawing.Point(684, 5);
+      this.infoGroupBox.Location = new System.Drawing.Point(580, 5);
       this.infoGroupBox.Name = "infoGroupBox";
       this.infoGroupBox.Size = new System.Drawing.Size(133, 89);
@@ -335 +353 @@
       this.jobsLabel.Text = "Jobs:";
       // 
-      // jobsTreeView
-      // 
-      this.jobsTreeView.AllowDrop = true;
-      this.jobsTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.jobsTreeView.Caption = "ItemTree View";
-      this.jobsTreeView.Content = null;
-      this.jobsTreeView.Location = new System.Drawing.Point(2, 3);
-      this.jobsTreeView.Name = "jobsTreeView";
-      this.jobsTreeView.ReadOnly = false;
-      this.jobsTreeView.Size = new System.Drawing.Size(808, 488);
-      this.jobsTreeView.TabIndex = 0;
-      this.jobsTreeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragDrop);
-      this.jobsTreeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragEnter);
-      this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
+      // isPrivilegedCheckBox
+      // 
+      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.isPrivilegedCheckBox.AutoSize = true;
+      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(383, 55);
+      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
+      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
+      this.isPrivilegedCheckBox.TabIndex = 26;
+      this.isPrivilegedCheckBox.Text = "IsPrivileged";
+      this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the job will be executed in a privileged sandbox on the slave.");
+      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
+      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckedChanged);
       // 
       // RefreshableHiveExperimentView
@@ -356 +370 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.isPrivilegedCheckBox);
       this.Controls.Add(this.infoGroupBox);
       this.Controls.Add(this.refreshAutomaticallyCheckBox);
@@ -372 +387 @@
       this.Controls.Add(this.resetButton);
       this.Name = "RefreshableHiveExperimentView";
-      this.Size = new System.Drawing.Size(821, 628);
+      this.Size = new System.Drawing.Size(717, 560);
       this.tabControl.ResumeLayout(false);
       this.jobsTabPage.ResumeLayout(false);
@@ -410 +425 @@
     private System.Windows.Forms.Label calculatingLabel;
     private System.Windows.Forms.Label jobsLabel;
+    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
 
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.cs

@@ -103 +103 @@
         resourceNamesTextBox.Text = string.Empty;
         useLocalPluginsCheckBox.Checked = false;
+        isPrivilegedCheckBox.Checked = false;
         logView.Content = null;
-        //includeJobsCheckBox.Checked = false;
-        refreshAutomaticallyCheckBox.Checked = false;
+        refreshAutomaticallyCheckBox.Checked = false;        
         logView.Content = null;
       } else {
@@ -112 +112 @@
         resourceNamesTextBox.Text = Content.HiveExperiment.ResourceNames;
         useLocalPluginsCheckBox.Checked = Content.HiveExperiment.UseLocalPlugins;
-        //includeJobsCheckBox.Checked = Content.IncludeJobs;
+        isPrivilegedCheckBox.Checked = Content.HiveExperiment.IsPrivileged;
         refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
         logView.Content = Content.Log;
@@ -138 +138 @@
         this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
 
+        this.isPrivilegedCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded); // TODO: check if user has the rights to do this
         this.useLocalPluginsCheckBox.Enabled = Content.IsControllable && !(Content.HiveExperiment.ExecutionState != ExecutionState.Prepared || alreadyUploaded);
         this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.HiveExperiment.ExecutionState == ExecutionState.Started;
         this.refreshButton.Enabled = Content.IsControllable && alreadyUploaded;
         this.Locked = !Content.IsControllable || Content.HiveExperiment.ExecutionState == ExecutionState.Started;
+
       }
       SetEnabledStateOfExecutableButtons();
@@ -296 +298 @@
     private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
       if (Content != null) Content.HiveExperiment.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
+    }
+
+    private void isPrivilegedCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (Content != null) Content.HiveExperiment.IsPrivileged = isPrivilegedCheckBox.Checked;
     }
 

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

@@ -228 +228 @@
       Guid jobId = (Guid)jobIdObj;
       Job job = null;
-      bool usedCoresIncremented = false;
+      int usedCores = 0;
       try {
         job = wcfService.GetJob(jobId);
@@ -234 +234 @@
         if (ConfigManager.Instance.GetFreeCores() < job.CoresNeeded) throw new OutOfCoresException();
         if (ConfigManager.GetFreeMemory() < job.MemoryNeeded) throw new OutOfMemoryException();
-        SlaveStatusInfo.IncrementUsedCores(job.CoresNeeded); usedCoresIncremented = true;
+        SlaveStatusInfo.IncrementUsedCores(job.CoresNeeded); usedCores = job.CoresNeeded;
         JobData jobData = wcfService.GetJobData(jobId);
         if (jobData == null) throw new JobDataNotFoundException(jobId);
@@ -242 +242 @@
       }
       catch (JobNotFoundException) {
-        if (usedCoresIncremented) SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
         throw;
       }
       catch (JobDataNotFoundException) {
-        SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
         throw;
       }
       catch (JobAlreadyRunningException) {
-        SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
         throw;
       }
@@ -261 +261 @@
         throw;
       }
-      catch (Exception) {
-        if (usedCoresIncremented) SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+      catch (Exception e) {
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
+        wcfService.UpdateJobState(jobId, JobState.Waiting, e.ToString()); // unknown internal error - report and set waiting again
         throw;
       }
@@ -372 +373 @@
         job.ExecutionTime = slaveJob.ExecutionTime;
         if (jobData != null) {
-          wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Failed);
+          wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Failed, exception.ToString());
         } else {
           wcfService.UpdateJobState(job.Id, JobState.Failed, exception.ToString());

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

@@ -154 +154 @@
     #region Job Events
     private void Job_JobFailed(object sender, EventArgs e) {
+      IsStopping = true;
       EventArgs<Exception> ex = (EventArgs<Exception>)e;
       currentException = ex.Value;
@@ -161 +162 @@
 
     private void Job_JobStopped(object sender, EventArgs e) {
+      IsStopping = true;
       if (wasJobAborted)
         pauseStopSem.Release();
@@ -168 +170 @@
 
     private void Job_JobPaused(object sender, EventArgs e) {
+      IsPausing = true;
       pauseStopSem.Release();
       executorQueue.AddMessage(ExecutorMessageType.JobPaused);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/JobManager.cs

@@ -86 +86 @@
         }
         catch (Exception) {
+          RemoveSlaveJob(job.Id, slaveJob); // clean up and rethrow
           slaveJob.DisposeAppDomain();
-          RemoveSlaveJob(job.Id, slaveJob); // clean up and rethrow
           throw;
         }
@@ -268 +268 @@
         if (jobData == null) throw new SerializationException();
       }
-      catch { }
+      catch { /* jobData will be null */ }
       SlaveStatusInfo.IncrementJobsFailed();
       OnJobFailed(slaveJob, jobData, e.Value2);

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

@@ -101 +101 @@
     /// Uploads the jobData and sets a new jobState (while correctly setting Transferring state)
     /// </summary>
-    public void UpdateJobData(Job job, JobData jobData, Guid slaveId, JobState state) {
+    public void UpdateJobData(Job job, JobData jobData, Guid slaveId, JobState state, string exception = "") {
       CallHiveService(service => {
         service.UpdateJob(job);
         job = service.UpdateJobState(job.Id, JobState.Transferring, slaveId, null, null);
         service.UpdateJobData(job, jobData);
-        service.UpdateJobState(job.Id, state, slaveId, null, null);
+        service.UpdateJobState(job.Id, state, slaveId, null, exception);
       });
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj

@@ -125 +125 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HiveJobs\ControllableHiveJobView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="HiveJobs\ControllableHiveJobView.designer.cs">
-      <DependentUpon>ControllableHiveJobView.cs</DependentUpon>
+    <Compile Include="HiveJobs\OptimizerHiveJobView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HiveJobs\OptimizerHiveJobView.designer.cs">
+      <DependentUpon>OptimizerHiveJobView.cs</DependentUpon>
     </Compile>
     <Compile Include="HiveItemView.cs">
@@ -220 +220 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="HiveJobs\ControllableHiveJobView.resx">
-      <DependentUpon>ControllableHiveJobView.cs</DependentUpon>
+    <EmbeddedResource Include="HiveJobs\OptimizerHiveJobView.resx">
+      <DependentUpon>OptimizerHiveJobView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="HiveJobs\HiveJobView.resx">

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveClient.cs

@@ -225 +225 @@
 
           foreach (HiveJob hiveJob in refreshableHiveExperiment.HiveExperiment.HiveJobs) {
-            UploadJobWithChildren(refreshableHiveExperiment.HiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.UseLocalPlugins, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log);
+            UploadJobWithChildren(refreshableHiveExperiment.HiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.UseLocalPlugins, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log, refreshableHiveExperiment.HiveExperiment.IsPrivileged);
           }
 
@@ -257 +257 @@
     /// <param name="parentHiveJob">shall be null if its the root job</param>
     /// <param name="groups"></param>
-    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, bool useLocalPlugins, Guid hiveExperimentId, ILog log) {
+    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, bool useLocalPlugins, Guid hiveExperimentId, ILog log, bool isPrivileged) {
       jobCount++;
       progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
@@ -263 +263 @@
       List<IPluginDescription> plugins;
 
-      if (hiveJob.ItemJob.ComputeInParallel &&
-        (hiveJob.ItemJob.Item is Optimization.Experiment || hiveJob.ItemJob.Item is Optimization.BatchRun)) {
+      if (hiveJob.ItemJob.ComputeInParallel && (hiveJob.ItemJob.Item is Optimization.Experiment || hiveJob.ItemJob.Item is Optimization.BatchRun)) {
         hiveJob.Job.IsParentJob = true;
         hiveJob.Job.FinishWhenChildJobsFinished = true;
@@ -279 +278 @@
       hiveJob.Job.PluginsNeededIds.Add(configPluginId);
       hiveJob.Job.HiveExperimentId = hiveExperimentId;
+      hiveJob.Job.IsPrivileged = isPrivileged;
 
       progress.Status = string.Format("Uploading job {0} of {1} ({2} kb, {3} objects)", jobCount, totalJobCount, jobData.Data.Count() / 1024, hiveJob.ItemJob.GetObjectGraphObjects().Count());
@@ -293 +293 @@
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, useLocalPlugins, hiveExperimentId, log);
+        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, useLocalPlugins, hiveExperimentId, log, isPrivileged);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/EngineHiveJob.cs

@@ -56 +56 @@
 
       // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems
-      lock (locker) {
+      //lock (locker) {
         ((IAtomicOperation)ItemJob.InitialOperation).Scope.Parent = parentScopeClone;
         ItemJob.InitialOperation = (IOperation)ItemJob.InitialOperation.Clone();
         ((IAtomicOperation)ItemJob.InitialOperation).Scope.ClearParentScopes();
         jobData.Data = PersistenceUtil.Serialize(ItemJob, out usedTypes);
-      }
+      //}
 
       // add type objects from object graph to work around ticket #1527

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs

@@ -25 +25 @@
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -37 +38 @@
   public class HiveJob : NamedItem, IItemTree<HiveJob> {
     protected static object locker = new object();
+    protected ReaderWriterLockSlim childHiveJobsLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
     public override Image ItemImage {
@@ -109 +111 @@
     protected ItemList<HiveJob> childHiveJobs;
     public virtual ReadOnlyItemList<HiveJob> ChildHiveJobs {
-      get { return childHiveJobs.AsReadOnly(); }
+      get {
+        childHiveJobsLock.EnterReadLock();
+        try {
+          return childHiveJobs.AsReadOnly();
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
+      }
     }
 
@@ -117 +125 @@
     #region Constructors and Cloning
     public HiveJob() {
-      this.Job = new Job() {
-        CoresNeeded = 1,
-        MemoryNeeded = 0
-      };
+      this.Job = new Job() { CoresNeeded = 1, MemoryNeeded = 0 };
       job.State = JobState.Offline;
       this.childHiveJobs = new ItemList<HiveJob>();
@@ -152 +157 @@
       this.Job = cloner.Clone(original.job);
       this.ItemJob = cloner.Clone(original.ItemJob);
-      this.childHiveJobs = cloner.Clone(original.childHiveJobs);
+      original.childHiveJobsLock.EnterReadLock();
+      try {
+        this.childHiveJobs = cloner.Clone(original.childHiveJobs);
+      }
+      finally { original.childHiveJobsLock.ExitReadLock(); }
       this.syncJobsWithOptimizers = original.syncJobsWithOptimizers;
       this.isFinishedJobDownloaded = original.isFinishedJobDownloaded;
@@ -198 +207 @@
 
     public virtual void AddChildHiveJob(HiveJob hiveJob) {
-      this.childHiveJobs.Add(hiveJob);
+      childHiveJobsLock.EnterWriteLock();
+      try {
+        this.childHiveJobs.Add(hiveJob);
+      }
+      finally { childHiveJobsLock.ExitWriteLock(); }
     }
 
@@ -237 +250 @@
       IEnumerable<Type> usedTypes;
       byte[] jobByteArray = PersistenceUtil.Serialize(this.ItemJob, out usedTypes);
-
-      JobData jobData = new JobData() {
-        JobId = job.Id,
-        Data = jobByteArray
-      };
-
+      JobData jobData = new JobData() { JobId = job.Id, Data = jobByteArray };
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-
       return jobData;
     }
@@ -295 +302 @@
     /// </summary>
     public IEnumerable<HiveJob> GetAllHiveJobs() {
-      var jobs = new List<HiveJob>();
-      jobs.Add(this);
-      foreach (HiveJob child in this.ChildHiveJobs) {
-        jobs.AddRange(child.GetAllHiveJobs());
-      }
-      return jobs;
+      childHiveJobsLock.EnterReadLock();
+      try {
+        var jobs = new List<HiveJob>();
+        jobs.Add(this);
+        foreach (HiveJob child in this.childHiveJobs) {
+          jobs.AddRange(child.GetAllHiveJobs());
+        }
+        return jobs;
+      }
+      finally { childHiveJobsLock.ExitReadLock(); }
     }
 
     public HiveJob GetParentByJobId(Guid jobId) {
-      if (this.ChildHiveJobs.SingleOrDefault(j => j.job.Id == jobId) != null)
-        return this;
-      foreach (HiveJob child in this.childHiveJobs) {
-        HiveJob result = child.GetParentByJobId(jobId);
-        if (result != null)
-          return result;
-      }
-      return null;
+      childHiveJobsLock.EnterReadLock();
+      try {
+        if (this.ChildHiveJobs.SingleOrDefault(j => j.job.Id == jobId) != null)
+          return this;
+        foreach (HiveJob child in this.childHiveJobs) {
+          HiveJob result = child.GetParentByJobId(jobId);
+          if (result != null)
+            return result;
+        }
+        return null;
+      }
+      finally { childHiveJobsLock.ExitWriteLock(); }
     }
 
@@ -321 +336 @@
         return this;
       } else {
-        foreach (HiveJob child in this.ChildHiveJobs) {
-          HiveJob result = child.GetHiveJobByJobId(jobId);
-          if (result != null)
-            return result;
-        }
+        childHiveJobsLock.EnterReadLock();
+        try {
+          foreach (HiveJob child in this.childHiveJobs) {
+            HiveJob result = child.GetHiveJobByJobId(jobId);
+            if (result != null)
+              return result;
+          }
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
       }
       return null;
@@ -331 +350 @@
 
     public void RemoveByJobId(Guid jobId) {
-      IEnumerable<HiveJob> jobs = ChildHiveJobs.Where(j => j.Job.Id == jobId).ToList(); // if Guid.Empty needs to be removed, there could be more than one with this jobId
-      foreach (HiveJob j in jobs) {
-        this.childHiveJobs.Remove(j);
-      }
-      foreach (HiveJob child in ChildHiveJobs) {
-        child.RemoveByJobId(jobId);
-      }
+      childHiveJobsLock.EnterWriteLock();
+      try {
+        IEnumerable<HiveJob> jobs = childHiveJobs.Where(j => j.Job.Id == jobId).ToList();
+        foreach (HiveJob j in jobs) {
+          this.childHiveJobs.Remove(j);
+        }
+        foreach (HiveJob child in childHiveJobs) {
+          child.RemoveByJobId(jobId);
+        }
+      }
+      finally { childHiveJobsLock.ExitWriteLock(); }
     }
 
     public IEnumerable<IItemTree<HiveJob>> GetChildItems() {
-      return this.childHiveJobs;
+      return this.ChildHiveJobs;
     }
 
@@ -371 +394 @@
     public void Pause() {
       if (this.Job.IsParentJob) {
-        foreach (var child in ChildHiveJobs) {
-          ServiceLocator.Instance.CallHiveService(s => s.PauseJob(child.job.Id));
-        }
+        childHiveJobsLock.EnterReadLock();
+        try {
+          foreach (var child in childHiveJobs) {
+            ServiceLocator.Instance.CallHiveService(s => s.PauseJob(child.job.Id));
+          }
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
       } else {
         ServiceLocator.Instance.CallHiveService(s => s.PauseJob(this.job.Id));
@@ -381 +408 @@
     public void Stop() {
       if (this.Job.IsParentJob) {
-        foreach (var child in ChildHiveJobs) {
-          ServiceLocator.Instance.CallHiveService(s => s.StopJob(child.job.Id));
-        }
+        childHiveJobsLock.EnterReadLock();
+        try {
+          foreach (var child in childHiveJobs) {
+            ServiceLocator.Instance.CallHiveService(s => s.StopJob(child.job.Id));
+          }
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
       } else {
         ServiceLocator.Instance.CallHiveService(s => s.StopJob(this.job.Id));

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/OptimizerHiveJob.cs

@@ -129 +129 @@
     private void Optimizers_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
       if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
-        foreach (var item in e.Items) {
-          if (GetChildByOptimizer(item.Value) == null && item.Value.Name != "Placeholder") {
-            this.childHiveJobs.Add(new OptimizerHiveJob(item.Value));
-          }
-        }
+        childHiveJobsLock.EnterWriteLock();
+        try {
+          foreach (var item in e.Items) {
+            if (GetChildByOptimizer(item.Value) == null && item.Value.Name != "Placeholder") {
+              this.childHiveJobs.Add(new OptimizerHiveJob(item.Value));
+            }
+          }
+        }
+        finally { childHiveJobsLock.ExitWriteLock(); }
       }
     }
     private void Optimizers_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
       if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
-        foreach (var item in e.OldItems) {
-          this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
-        }
-        foreach (var item in e.Items) {
-          if (GetChildByOptimizer(item.Value) == null && item.Value.Name != "Placeholder") {
-            this.childHiveJobs.Add(new OptimizerHiveJob(item.Value));
-          }
-        }
+        childHiveJobsLock.EnterWriteLock();
+        try {
+          foreach (var item in e.OldItems) {
+            this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
+          }
+          foreach (var item in e.Items) {
+            if (GetChildByOptimizer(item.Value) == null && item.Value.Name != "Placeholder") {
+              this.childHiveJobs.Add(new OptimizerHiveJob(item.Value));
+            }
+          }
+        }
+        finally { childHiveJobsLock.ExitWriteLock(); }
       }
     }
     private void Optimizers_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
       if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
-        foreach (var item in e.Items) {
-          this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
-        }
+        childHiveJobsLock.EnterWriteLock();
+        try {
+          foreach (var item in e.Items) {
+            this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
+          }
+        }
+        finally { childHiveJobsLock.ExitWriteLock(); }
       }
     }
     private void Optimizers_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
       if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
-        foreach (var item in e.Items) {
-          this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
-        }
+        childHiveJobsLock.EnterWriteLock();
+        try {
+          foreach (var item in e.Items) {
+            this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
+          }
+        }
+        finally { childHiveJobsLock.ExitWriteLock(); }
       }
     }
@@ -182 +198 @@
 
       OptimizerHiveJob child = (OptimizerHiveJob)this.ChildHiveJobs.Single(j => j.Job.Id == childJobId);
-      if (!optimizerJob.ComputeInParallel) {
-        child.syncJobsWithOptimizers = false;
-        child.ItemJob = optimizerJob;
-        child.syncJobsWithOptimizers = true;
-      }
+      childHiveJobsLock.EnterReadLock();
+      try {
+        if (!optimizerJob.ComputeInParallel) {
+          child.syncJobsWithOptimizers = false;
+          child.ItemJob = optimizerJob;
+          child.syncJobsWithOptimizers = true;
+        }
+      }
+      finally { childHiveJobsLock.ExitReadLock(); }
       syncJobsWithOptimizers = true;
     }
@@ -243 +263 @@
         }
       }
-      foreach (OptimizerHiveJob child in childHiveJobs) {
-        child.SetIndexInParentOptimizerList(this);
-      }
+      childHiveJobsLock.EnterReadLock();
+      try {
+        foreach (OptimizerHiveJob child in childHiveJobs) {
+          child.SetIndexInParentOptimizerList(this);
+        }
+      }
+      finally { childHiveJobsLock.ExitReadLock(); }
     }
 
@@ -302 +326 @@
       }
 
-      JobData jobData = new JobData() {
-        JobId = job.Id,
-        Data = jobByteArray
-      };
-
+      JobData jobData = new JobData() { JobId = job.Id, Data = jobByteArray };
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-
       return jobData;
     }
 
     public OptimizerHiveJob GetChildByOptimizerJob(OptimizerJob optimizerJob) {
-      foreach (OptimizerHiveJob child in ChildHiveJobs) {
-        if (child.ItemJob == optimizerJob)
-          return child;
-      }
-      return null;
+      childHiveJobsLock.EnterReadLock();
+      try {
+        foreach (OptimizerHiveJob child in childHiveJobs) {
+          if (child.ItemJob == optimizerJob)
+            return child;
+        }
+        return null;
+      }
+      finally { childHiveJobsLock.ExitReadLock(); }
     }
 
     public HiveJob<OptimizerJob> GetChildByOptimizer(IOptimizer optimizer) {
-      foreach (OptimizerHiveJob child in ChildHiveJobs) {
-        if (child.ItemJob.Item == optimizer)
-          return child;
-      }
-      return null;
+      childHiveJobsLock.EnterReadLock();
+      try {
+        foreach (OptimizerHiveJob child in childHiveJobs) {
+          if (child.ItemJob.Item == optimizer)
+            return child;
+        }
+        return null;
+      }
+      finally { childHiveJobsLock.ExitReadLock(); }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/ItemJob.cs

@@ -31 +31 @@
   [Item("Item Job", "Represents a executable hive job which contains a HeuristicLab Item.")]
   [StorableClass]
-  public abstract class ItemJob : DeepCloneable, IJob {
+  public abstract class ItemJob : NamedItem, IJob {
     public virtual bool IsParallelizable {
       get { return true; }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs

@@ -86 +86 @@
 
     #region IJob Members
-
     public override ExecutionState ExecutionState {
       get { return Item.ExecutionState; }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/RefreshableHiveExperiment.cs

@@ -395 +395 @@
 
     public override string ToString() {
-      return HiveExperiment.ToString();
+      return string.Format("{0} {1}", HiveExperiment.DateCreated.ToString("MM.dd.yyyy HH:mm"), HiveExperiment.ToString());
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -33 +33 @@
       get { return useLocalPlugins; }
       set { useLocalPlugins = value; }
+    }
+
+    private bool isPrivileged;
+    public bool IsPrivileged {
+      get { return isPrivileged; }
+      set { isPrivileged = value; }
     }
 
@@ -89 +95 @@
       this.ResourceNames = "HEAL";
       this.HiveJobs = new ItemCollection<HiveJob>();
+      this.DateCreated = DateTime.Now;
     }
 
@@ -103 +110 @@
       this.UseLocalPlugins = original.UseLocalPlugins;
       this.ExecutionTime = original.ExecutionTime;
+      this.IsPrivileged = original.IsPrivileged;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.4/IJob.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Hive {
-  public interface IJob : INamedItem {
-
+  public interface IJob : IDeepCloneable, ICloneable {
     TimeSpan ExecutionTime { get; }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.Designer.cs

@@ -33 +33 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.jobsTabPage = new System.Windows.Forms.TabPage();
-      this.hiveExperimentListView = new HiveExperimentListView();
+      this.hiveExperimentListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.RefreshableHiveExperimentListView();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
@@ -39 +39 @@
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
       this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
+      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
@@ -60 +61 @@
       this.resourceIdsTextBox.Location = new System.Drawing.Point(189, 52);
       this.resourceIdsTextBox.Name = "resourceIdsTextBox";
-      this.resourceIdsTextBox.Size = new System.Drawing.Size(405, 20);
+      this.resourceIdsTextBox.Size = new System.Drawing.Size(319, 20);
       this.resourceIdsTextBox.TabIndex = 4;
       this.resourceIdsTextBox.Text = "HEAL";
@@ -184 +185 @@
       this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.useLocalPluginsCheckBox.AutoSize = true;
-      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(600, 55);
+      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(598, 55);
       this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
-      this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(103, 17);
+      this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17);
       this.useLocalPluginsCheckBox.TabIndex = 12;
-      this.useLocalPluginsCheckBox.Text = "useLocalPlugins";
+      this.useLocalPluginsCheckBox.Text = "UseLocalPlugins";
       this.useLocalPluginsCheckBox.UseVisualStyleBackColor = true;
       this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
       // 
+      // isPrivilegedCheckBox
+      // 
+      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.isPrivilegedCheckBox.AutoSize = true;
+      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(514, 55);
+      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
+      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
+      this.isPrivilegedCheckBox.TabIndex = 13;
+      this.isPrivilegedCheckBox.Text = "IsPrivileged";
+      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
+      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckedChanged);
+      // 
       // HiveEngineView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.isPrivilegedCheckBox);
       this.Controls.Add(this.useLocalPluginsCheckBox);
       this.Controls.Add(this.executionTimeTextBox);
@@ -231 +245 @@
     private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
     private HeuristicLab.Core.Views.LogView logView;
-    private HiveExperimentListView hiveExperimentListView;
+    private RefreshableHiveExperimentListView hiveExperimentListView;
+    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4/HiveEngineView.cs

@@ -74 +74 @@
         executionTimeOnHiveTextBox.Text = string.Empty;
         useLocalPluginsCheckBox.Checked = false;
+        isPrivilegedCheckBox.Checked = false;
         hiveExperimentListView.Content = null;
         logView.Content = null;
@@ -81 +82 @@
         executionTimeOnHiveTextBox.Text = Content.ExecutionTimeOnHive.ToString();
         useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
+        isPrivilegedCheckBox.Checked = Content.IsPrivileged;
         hiveExperimentListView.Content = Content.HiveExperiments;
         logView.Content = Content.Log;
@@ -93 +95 @@
         priorityTextBox.ReadOnly = this.ReadOnly;
         useLocalPluginsCheckBox.Enabled = !this.ReadOnly;
+        isPrivilegedCheckBox.Enabled = !this.ReadOnly; // TODO: check for user rights
       } else {
         resourceIdsTextBox.ReadOnly = false;
         priorityTextBox.ReadOnly = false;
         useLocalPluginsCheckBox.Enabled = false;
+        isPrivilegedCheckBox.Enabled = false;
       }
     }
@@ -112 +116 @@
       Content.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
     }
+
+    private void isPrivilegedCheckBox_CheckedChanged(object sender, EventArgs e) {
+      Content.IsPrivileged = isPrivilegedCheckBox.Checked;
+    }
     #endregion
-
-
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -74 +74 @@
     }
 
+    [Storable]
+    private bool isPrivileged;
+    public bool IsPrivileged {
+      get { return isPrivileged; }
+      set { isPrivileged = value; }
+    }
+
     // [Storable] -> HiveExperiment can't be storable, so RefreshableHiveExperiment can't be stored
     private ItemCollection<RefreshableHiveExperiment> hiveExperiments = new ItemCollection<RefreshableHiveExperiment>();
@@ -108 +115 @@
       this.executionTimeOnHive = original.executionTimeOnHive;
       this.useLocalPlugins = original.useLocalPlugins;
+      this.IsPrivileged = original.IsPrivileged;
       // this.hiveExperiments = cloner.Clone(original.hiveExperiments); do not clone hiveExperiments - otherwise they would be sent with every job
     }
@@ -187 +195 @@
           //  }
           //} else if (coll.Parallel) {
-          if(coll.Parallel) {
+          if (coll.Parallel) {
             // clone the parent scope here and reuse it for each operation. otherwise for each job the whole scope-tree first needs to be copied and then cleaned, which causes a lot of work for the Garbage Collector
             IScope parentScopeClone = (IScope)((IAtomicOperation)coll.First()).Scope.Parent.Clone();
@@ -272 +280 @@
       IScope[] scopes = new Scope[jobs.Length];
       object locker = new object();
-      IDictionary<Guid, int> jobIndices = new Dictionary<Guid, int>();
       var hiveExperiment = refreshableHiveExperiment.HiveExperiment;
 
       try {
-        List<Guid> remainingJobIds = new List<Guid>();
-
         // create upload-tasks
-        var uploadTasks = new List<Task<Job>>();
         for (int i = 0; i < jobs.Length; i++) {
-          hiveExperiment.HiveJobs.Add(new EngineHiveJob(jobs[i], parentScopeClone));
+          var engineHiveJob = new EngineHiveJob(jobs[i], parentScopeClone);
+          engineHiveJob.Job.Priority = this.Priority;
+          hiveExperiment.HiveJobs.Add(engineHiveJob);
 
           // shuffle random variable to avoid the same random sequence in each operation; todo: does not yet work (it cannot find the random variable)
@@ -288 +294 @@
             random.Reset(random.Next());
         }
-        HiveClient.StartExperiment((e) => {
-          LogException(e);
-        }, refreshableHiveExperiment);
+        HiveClient.StartExperiment((e) => { LogException(e); }, refreshableHiveExperiment);
 
         // do polling until experiment is finished and all jobs are downloaded
         while (!refreshableHiveExperiment.AllJobsFinished()) {
-          Thread.Sleep(500);
+          Thread.Sleep(2000);
           this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(hiveExperiments.Sum(x => x.HiveExperiment.ExecutionTime.TotalMilliseconds));
           cancellationToken.ThrowIfCancellationRequested();
         }
         LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableHiveExperiment.ToString(), refreshableHiveExperiment.HiveExperiment.ExecutionTime));
+
+        var failedJobs = hiveExperiment.HiveJobs.Where(x => x.Job.State == JobState.Failed);
+        if(failedJobs.Count() > 0) {
+          throw new HiveEngineException("Job failed: " + failedJobs.First().Job.StateLog.Last().Exception);
+        }
 
         // get scopes
         int j = 0;
         foreach (var hiveJob in hiveExperiment.HiveJobs) {
-          if (hiveJob.Job.State != JobState.Finished)
-            throw new HiveEngineException("Job failed: " + hiveJob.Job.StateLog.Last().Exception);
-
           var scope = ((IAtomicOperation)((EngineJob)hiveJob.ItemJob).InitialOperation).Scope;
           scopes[j++] = scope;
@@ -313 +319 @@
       catch (OperationCanceledException e) {
         lock (locker) {
-          if (jobIndices != null) DeleteHiveExperiment(hiveExperiment.Id);
+          DeleteHiveExperiment(hiveExperiment.Id);
         }
         throw e;
@@ -319 +325 @@
       catch (Exception e) {
         lock (locker) {
-          if (jobIndices != null) DeleteHiveExperiment(hiveExperiment.Id);
+          DeleteHiveExperiment(hiveExperiment.Id);
         }
         LogException(e);
@@ -333 +339 @@
         hiveExperiment.UseLocalPlugins = this.UseLocalPlugins;
         hiveExperiment.ResourceNames = this.ResourceNames;
+        hiveExperiment.IsPrivileged = this.IsPrivileged;
         var refreshableHiveExperiment = new RefreshableHiveExperiment(hiveExperiment);
         refreshableHiveExperiment.IsControllable = false;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Tests

@@ -5 +5 @@
 HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
 Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.user
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.vs10x

@@ -5 +5 @@
 HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
 Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.user
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.vs10x

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Tests/Program.cs

@@ -47 +47 @@
       GeneticAlgorithm alg = new GeneticAlgorithm();
       alg.Problem = new SingleObjectiveTestFunctionProblem();
-      alg.Engine = new HiveEngine() { ResourceNames = "CHRISTOPH-PC" };
+      alg.Engine = new HiveEngine() { ResourceNames = "HEAL" };
       alg.Elites.Value = 0;
       alg.PopulationSize.Value = 10;

@@ -5 +5 @@
 HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
 Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.user
+HeuristicLab.HiveEngine-3.4.ConsoleTests.csproj.vs10x