Changeset 7417 for branches

Timestamp:

01/26/12 22:01:38 (13 years ago)

Author:

ascheibe

Message:

#1744 added an option so that the parent task can also wait on the slave for the child tasks to finish

Location:

branches/HiveHiveEngine

Files:

• HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.Designer.cs (modified) (7 diffs)
• HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.cs (modified) (3 diffs)
• HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (9 diffs)

branches/HiveHiveEngine/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.Designer.cs

@@ -39 +39 @@
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
       this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
+      this.pauseOnWaitCheckbox = 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(428, 20);
+      this.resourceIdsTextBox.Size = new System.Drawing.Size(415, 20);
       this.resourceIdsTextBox.TabIndex = 4;
       this.resourceIdsTextBox.Text = "HEAL";
@@ -100 +101 @@
       this.executionTimeOnHiveTextBox.Name = "executionTimeOnHiveTextBox";
       this.executionTimeOnHiveTextBox.ReadOnly = true;
-      this.executionTimeOnHiveTextBox.Size = new System.Drawing.Size(577, 20);
+      this.executionTimeOnHiveTextBox.Size = new System.Drawing.Size(475, 20);
       this.executionTimeOnHiveTextBox.TabIndex = 8;
       // 
@@ -135 +136 @@
       this.hiveExperimentListView.Name = "hiveExperimentListView";
       this.hiveExperimentListView.ReadOnly = false;
+      this.hiveExperimentListView.ShowDetails = true;
       this.hiveExperimentListView.Size = new System.Drawing.Size(686, 428);
       this.hiveExperimentListView.TabIndex = 0;
@@ -184 +186 @@
       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(623, 54);
+      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(610, 54);
       this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
       this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
@@ -192 +194 @@
       this.isPrivilegedCheckBox.Validated += new System.EventHandler(this.isPrivilegedCheckBox_Validated);
       // 
+      // pauseOnWaitCheckbox
+      // 
+      this.pauseOnWaitCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.pauseOnWaitCheckbox.AutoSize = true;
+      this.pauseOnWaitCheckbox.Location = new System.Drawing.Point(610, 28);
+      this.pauseOnWaitCheckbox.Name = "pauseOnWaitCheckbox";
+      this.pauseOnWaitCheckbox.Size = new System.Drawing.Size(93, 17);
+      this.pauseOnWaitCheckbox.TabIndex = 14;
+      this.pauseOnWaitCheckbox.Text = "Pause on wait";
+      this.pauseOnWaitCheckbox.UseVisualStyleBackColor = true;
+      this.pauseOnWaitCheckbox.Validated += new System.EventHandler(this.pauseOnWaitCheckbox_Validated);
+      // 
       // HiveEngineView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.pauseOnWaitCheckbox);
       this.Controls.Add(this.isPrivilegedCheckBox);
       this.Controls.Add(this.executionTimeTextBox);
@@ -232 +247 @@
     private RefreshableHiveJobListView hiveExperimentListView;
     private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
+    private System.Windows.Forms.CheckBox pauseOnWaitCheckbox;
   }
 }

branches/HiveHiveEngine/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.cs

@@ -74 +74 @@
         executionTimeOnHiveTextBox.Text = string.Empty;
         isPrivilegedCheckBox.Checked = false;
+        pauseOnWaitCheckbox.Checked = true;
         hiveExperimentListView.Content = null;
         logView.Content = null;
@@ -83 +84 @@
         hiveExperimentListView.Content = Content.Jobs;
         logView.Content = Content.Log;
+        pauseOnWaitCheckbox.Checked = Content.PauseWhileCalculatingChilds;
       }
     }
@@ -112 +114 @@
       Content.IsPrivileged = isPrivilegedCheckBox.Checked;
     }
+
+    private void pauseOnWaitCheckbox_Validated(object sender, EventArgs e) {
+      Content.PauseWhileCalculatingChilds = pauseOnWaitCheckbox.Checked;
+    }
     #endregion
   }

branches/HiveHiveEngine/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -47 +47 @@
 
     [Storable]
+    public bool PauseWhileCalculatingChilds { get; set; }
+
+    [Storable]
     private IOperator currentOperator;
 
@@ -131 +134 @@
       username = cl.ClientCredentials.UserName.UserName;
       password = cl.ClientCredentials.UserName.Password;
+      PauseWhileCalculatingChilds = true;
     }
 
@@ -157 +161 @@
       this.nrOfSentRuns = original.nrOfSentRuns;
       this.ParentTaskId = original.ParentTaskId;
+      this.PauseWhileCalculatingChilds = original.PauseWhileCalculatingChilds;
       // do not clone jobs - otherwise they would be sent with every task
     }
@@ -200 +205 @@
         cancellationToken.ThrowIfCancellationRequested();
 
-        if (continueCollection != null && lastJobGuid != Guid.Empty) {
+        if (continueCollection != null && lastJobGuid != Guid.Empty && PauseWhileCalculatingChilds) {
           EngineTask[] eTasks = RetrieveResultsFromHive(lastJobGuid);
           RestoreStateFromExecutedHiveTasks(eTasks, continueCollection);
@@ -224 +229 @@
 
               var experiment = CreateJob();
-              ExecuteOnHive(experiment, tasks, parentScopeClone, new CancellationToken());
-              continueCollection = coll;
-              Pause();
+              var engineTasks = ExecuteOnHive(experiment, tasks, parentScopeClone, new CancellationToken());
+              if (PauseWhileCalculatingChilds) {
+                continueCollection = coll;
+                Pause();
+              } else {
+                RestoreStateFromExecutedHiveTasks(engineTasks, coll);
+              }
             }
             catch {
@@ -304 +313 @@
 
     /// <summary>
-    /// This method blocks until all jobs are finished
     /// TODO: Cancelation needs to be refined; all tasks currently stay in Semaphore.WaitOne after cancelation
     /// </summary>
     /// <param name="tasks"></param>
-    private void ExecuteOnHive(RefreshableJob refreshableJob, EngineTask[] tasks, IScope parentScopeClone, CancellationToken cancellationToken) {
+    private EngineTask[] ExecuteOnHive(RefreshableJob refreshableJob, EngineTask[] tasks, IScope parentScopeClone, CancellationToken cancellationToken) {
       log.LogMessage(string.Format("Executing {0} operations on the hive.", tasks.Length));
       IScope[] scopes = new Scope[tasks.Length];
@@ -319 +327 @@
           var engineHiveTask = new EngineHiveTask(tasks[i], parentScopeClone);
           engineHiveTask.Task.Priority = this.Priority;
-          if (ParentTaskId != Guid.Empty) {
+          if (ParentTaskId != Guid.Empty && PauseWhileCalculatingChilds) {
             engineHiveTask.Task.ParentTaskId = ParentTaskId;
           }
@@ -325 +333 @@
 
           // shuffle random variable to avoid the same random sequence in each operation; todo: does not yet work (it cannot find the random variable)
-          IRandom random = FindRandomParameter(tasks[i].InitialOperation as IExecutionContext);
-          if (random != null)
-            random.Reset(random.Next());
+          //IRandom random = FindRandomParameter(tasks[i].InitialOperation as IExecutionContext);
+          //if (random != null)
+          //random.Reset(random.Next());
         }
         HiveClient.StartJob((e) => { log.LogException(e); }, refreshableJob, cancellationToken);
@@ -338 +346 @@
         handle.WaitOne();
         refreshableJob.Progress.Finished -= new EventHandler(Progress_Finished);
+
+        if (!PauseWhileCalculatingChilds) {
+
+          while (!refreshableJob.AllJobsFinished()) {
+            Thread.Sleep(1000);
+          }
+
+          List<HiveTask> allHiveTasks = refreshableJob.HiveTasks.ToList();
+          allHiveTasks.ForEach(x => this.ExecutionTimeOnHive += x.Task.ExecutionTime);
+
+          var failedJobs = allHiveTasks.Where(x => x.Task.State != TaskState.Finished);
+          if (failedJobs.Count() > 0) {
+            throw new HiveEngineException("Task (" + failedJobs.First().Task.Id + ") failed: " + failedJobs.First().Task.StateLog.Last().Exception);
+          }
+
+          List<EngineTask> engineTasks = new List<EngineTask>();
+
+          foreach (var hTask in allHiveTasks) {
+            EngineTask ehTask = (EngineTask)hTask.ItemTask;
+            engineTasks.Add(ehTask);
+          }
+
+          jobs.Clear();
+          DeleteHiveExperiment(refreshableJob.Id);
+
+          return engineTasks.ToArray();
+        } else {
+          return null;
+        }
       }
       catch (OperationCanceledException e) {