Changeset 7287 for branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

Timestamp:

01/07/12 02:07:44 (12 years ago)

Author:

ascheibe

Message:

#1744

• added the new Hive engine. The engine can now be executed in the Hive. If child tasks are created it pauses and is transfered back to the server. If the child tasks are finished it is sent back to a slave.
• changed the server so that it reschedules paused parent tasks if their childs are finished as well as tasks where FinishWhenChildJobsFinished is set to false

File:

• branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (4 diffs)

branches/HiveHiveEngine/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
 using TS = System.Threading.Tasks;
@@ -315 +316 @@
       finally {
         refreshableJob.IsProgressing = false;
+        refreshableJob.Progress.Finish();
       }
     }
@@ -364 +366 @@
           taskData = hiveTask.GetAsTaskData(true, out plugins);
         } else {
-          hiveTask.Task.IsParentTask = false;
+          if (hiveTask.ItemTask.Item is EngineAlgorithm && ((EngineAlgorithm)hiveTask.ItemTask.Item).Engine is IHiveEngine) {
+            hiveTask.Task.IsParentTask = true;
+            //TODO: this is a little hack so that this task does not get executed immediately because the taskdata will be uploaded twice
+            hiveTask.Task.State = TaskState.Aborted;
+          } else {
+            hiveTask.Task.IsParentTask = false;
+          }
+
           hiveTask.Task.FinishWhenChildJobsFinished = false;
           taskData = hiveTask.GetAsTaskData(false, out plugins);
@@ -389 +398 @@
             } else {
               hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData, groups.ToList()));
+
+              if (hiveTask.Task.State == TaskState.Aborted) {
+                //TODO: this is a very bad hack
+                if (hiveTask.ItemTask.Item is EngineAlgorithm && ((EngineAlgorithm)hiveTask.ItemTask.Item).Engine is IHiveEngine) {
+                  IHiveEngine he = ((EngineAlgorithm)hiveTask.ItemTask.Item).Engine as IHiveEngine;
+                  he.ParentTaskId = hiveTask.Task.Id;
+                  taskData = hiveTask.GetAsTaskData(false, out plugins);
+                  taskData.TaskId = hiveTask.Task.Id;
+
+                  Task t = HiveServiceLocator.Instance.CallHiveService((s) => s.GetTask(hiveTask.Task.Id));
+                  t.State = TaskState.Waiting;
+                  HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateTaskData(t, taskData));
+                }
+              }
+
             }
           }