Changeset 6006 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

Timestamp:

04/12/11 13:43:05 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
• One HiveExperiment can now have multiple Experiments.
• TreeView supports multiple root nodes
• HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
• updated ExperimentManager binaries

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.HiveEngine/3.4 (modified) (1 prop)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (15 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

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

@@ -2 +2 @@
 obj
 HeuristicLab.HiveEngine-3.4.csproj.vs10x
+HeuristicLabHiveEnginePlugin.cs

@@ -2 +2 @@
 obj
 HeuristicLab.HiveEngine-3.4.csproj.vs10x
+HeuristicLabHiveEnginePlugin.cs

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

@@ -25 +25 @@
 
     [Storable]
-    public string ResourceIds { get; set; }
+    public string ResourceNames { get; set; }
 
     [Storable]
@@ -46 +46 @@
     }
 
+    [Storable]
+    private bool useLocalPlugins;
+    public bool UseLocalPlugins {
+      get { return useLocalPlugins; }
+      set { useLocalPlugins = value; }
+    }
+
+    [Storable]
+    private ItemCollection<HiveExperiment> hiveExperiments;
+    public ItemCollection<HiveExperiment> HiveExperiments {
+      get { return hiveExperiments; }
+      set { hiveExperiments = value; }
+    }
+
     private List<Plugin> onlinePlugins;
     public List<Plugin> OnlinePlugins {
@@ -60 +74 @@
     #region constructors and cloning
     public HiveEngine() {
-      ResourceIds = "HEAL";
+      ResourceNames = "HEAL";
+      HiveExperiments = new ItemCollection<HiveExperiment>();
+      Priority = 0;
     }
 
@@ -67 +83 @@
     protected HiveEngine(HiveEngine original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceIds = original.ResourceIds;
+      this.ResourceNames = original.ResourceNames;
       this.currentOperator = cloner.Clone(original.currentOperator);
       this.priority = original.priority;
       this.executionTimeOnHive = original.executionTimeOnHive;
+      this.useLocalPlugins = original.useLocalPlugins;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -123 +140 @@
 
             IScope[] scopes = ExecuteOnHive(jobs, parentScopeClone, cancellationToken);
-            //IScope[] scopes = ExecuteLocally(jobs, parentScopeClone, cancellationToken);
             
             for (int i = 0; i < coll.Count; i++) {
@@ -186 +202 @@
     }
 
-    private IScope[] ExecuteLocally(EngineJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
-      IScope[] scopes = new Scope[jobs.Length];
-
-      for (int i = 0; i < jobs.Length; i++) {
-        var job = (EngineJob)jobs[i].Clone();
-        job.Start();
-        while (job.ExecutionState != ExecutionState.Stopped) {
-          Thread.Sleep(100);
-        }
-        scopes[i] = ((IAtomicOperation)job.InitialOperation).Scope;
-      }
-
-      return scopes;
-    }
+    // testfunction:
+    //private IScope[] ExecuteLocally(EngineJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
+    //  IScope[] scopes = new Scope[jobs.Length];
+    //  for (int i = 0; i < jobs.Length; i++) {
+    //    var job = (EngineJob)jobs[i].Clone();
+    //    job.Start();
+    //    while (job.ExecutionState != ExecutionState.Stopped) {
+    //      Thread.Sleep(100);
+    //    }
+    //    scopes[i] = ((IAtomicOperation)job.InitialOperation).Scope;
+    //  }
+    //  return scopes;
+    //}
 
     /// <summary>
@@ -211 +226 @@
       object locker = new object();
       IDictionary<Guid, int> jobIndices = new Dictionary<Guid, int>();
+      var hiveExperiment = new HiveExperiment();;
 
       try {
@@ -218 +234 @@
         int finishedCount = 0;
         int uploadCount = 0;
+
+        // create hive experiment
+        hiveExperiment.Name = "HiveEngine Run " + hiveExperiments.Count;
+        hiveExperiment.UseLocalPlugins = this.UseLocalPlugins;
+        hiveExperiment.ResourceNames = this.ResourceNames;
+        hiveExperiment.RefreshAutomatically = false;
+        hiveExperiment.Id = ServiceLocator.Instance.CallHiveService(s => s.AddHiveExperiment(hiveExperiment));
+        hiveExperiments.Add(hiveExperiment);
 
         // create upload-tasks
@@ -230 +254 @@
 
           uploadTasks.Add(Task.Factory.StartNew<Job>((keyValuePairObj) => {
-            return UploadJob(keyValuePairObj, parentScopeClone, cancellationToken, GetResourceIds());
+            return UploadJob(keyValuePairObj, parentScopeClone, cancellationToken, GetResourceIds(), hiveExperiment.Id);
           }, new KeyValuePair<int, EngineJob>(i, job), cancellationToken));
         }
@@ -313 +337 @@
 
         LogMessage(string.Format("All jobs finished (TotalExecutionTime: {0}).", executionTimes.Sum()));
-        DeleteJobs(jobIndices);
+        DeleteHiveExperiment(hiveExperiment.Id);
 
         return scopes;
@@ -319 +343 @@
       catch (OperationCanceledException e) {
         lock (locker) {
-          if (jobIndices != null) DeleteJobs(jobIndices);
+          if (jobIndices != null) DeleteHiveExperiment(hiveExperiment.Id);
         }
         throw e;
@@ -325 +349 @@
       catch (Exception e) {
         lock (locker) {
-          if (jobIndices != null) DeleteJobs(jobIndices);
+          if (jobIndices != null) DeleteHiveExperiment(hiveExperiment.Id);
         }
         LogException(e);
@@ -332 +356 @@
     }
 
-    private void DeleteJobs(IDictionary<Guid, int> jobIndices) {
-      if (jobIndices.Count > 0) {
-        TryAndRepeat(() => {
-          LogMessage(string.Format("Deleting {0} jobs on hive.", jobIndices.Count));
-          ServiceLocator.Instance.CallHiveService(service => {
-            foreach (Guid jobId in jobIndices.Keys) {
-              service.DeleteJob(jobId);
-            }
-            jobIndices.Clear();
-          });
-        }, 5, string.Format("Could not delete {0} jobs", jobIndices.Count));
-      }
+    private void DeleteHiveExperiment(Guid hiveExperimentId) {
+      TryAndRepeat(() => {
+        ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(hiveExperimentId));
+      }, 5, string.Format("Could not delete jobs"));
     }
 
     private static object locker = new object();
-    private Job UploadJob(object keyValuePairObj, IScope parentScopeClone, CancellationToken cancellationToken, List<Guid> resourceIds) {
+    private Job UploadJob(object keyValuePairObj, IScope parentScopeClone, CancellationToken cancellationToken, List<Guid> resourceIds, Guid hiveExperimentId) {
       var keyValuePair = (KeyValuePair<int, EngineJob>)keyValuePairObj;
       Job job = new Job();
@@ -370 +386 @@
         job.PluginsNeededIds = ServiceLocator.Instance.CallHiveService(s => PluginUtil.GetPluginDependencies(s, this.OnlinePlugins, this.AlreadyUploadedPlugins, neededPlugins, false));
         job.Priority = priority;
+        job.HiveExperimentId = hiveExperimentId;
 
         try {
@@ -396 +413 @@
     private List<Guid> GetResourceIds() {
       return ServiceLocator.Instance.CallHiveService(service => {
-        var resourceNames = ResourceIds.Split(';');
+        var resourceNames = ResourceNames.Split(';');
         var resourceIds = new List<Guid>();
         foreach (var resourceName in resourceNames) {

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

@@ -2 +2 @@
 obj
 HeuristicLab.HiveEngine-3.4.csproj.vs10x
+HeuristicLabHiveEnginePlugin.cs