Changeset 6000 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine

Timestamp:

04/11/11 15:32:27 (13 years ago)

Author:

cneumuel

Message:

#1233

• added GetPlugin service method
• fixed minor issues with double plugins in database
• worked on HiveEngine
• fixed wrong role name for Hive User
• fixed bug in group assignment of slaves

Location:

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

Files:

• . (modified) (1 prop)
• EngineJob.cs (modified) (4 diffs)
• HeuristicLabHiveEnginePlugin.cs (added)
• HiveEngine.cs (modified) (5 diffs)
• Properties/AssemblyInfo.cs (added)

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

@@ -33 +33 @@
       this.initialOperation = initialOperation;
       this.engine = engine;
-      this.engine.Prepare(initialOperation);
       RegisterEngineEvents();
     }
@@ -42 +41 @@
       : base(original, cloner) {
       this.engine = cloner.Clone(original.engine);
+      this.initialOperation = cloner.Clone(original.initialOperation);
       RegisterEngineEvents();
     }
@@ -60 +60 @@
 
     public override void Start() {
+      engine.Prepare(initialOperation);
       engine.Start();
     }
     
     public override void Pause() {
-      throw new NotImplementedException();
+      engine.Pause();
     }
 
@@ -80 +81 @@
     }
 
-    void engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+    private void engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnJobFailed(e);
     }
 
-    void engine_Stopped(object sender, EventArgs e) {
+    private void engine_Stopped(object sender, EventArgs e) {
       OnJobStopped();
     }

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

@@ -46 +46 @@
     }
 
-    private IEnumerable<Plugin> onlinePlugins;
-    public IEnumerable<Plugin> OnlinePlugins {
+    private List<Plugin> onlinePlugins;
+    public List<Plugin> OnlinePlugins {
       get { return onlinePlugins; }
       set { onlinePlugins = value; }
     }
-    
+
     private List<Plugin> alreadyUploadedPlugins;
     public List<Plugin> AlreadyUploadedPlugins {
@@ -102 +102 @@
       TaskScheduler.UnobservedTaskException += new EventHandler<UnobservedTaskExceptionEventArgs>(TaskScheduler_UnobservedTaskException);
 
-      this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins());
+      this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins()).Where(x => x.IsLocal == false).ToList();
       this.AlreadyUploadedPlugins = new List<Plugin>();
 
@@ -123 +123 @@
 
             IScope[] scopes = ExecuteOnHive(jobs, parentScopeClone, cancellationToken);
-
+            //IScope[] scopes = ExecuteLocally(jobs, parentScopeClone, cancellationToken);
+            
             for (int i = 0; i < coll.Count; i++) {
               if (coll[i] is IAtomicOperation) {
@@ -183 +184 @@
       target.SubScopes.AddRange(source.SubScopes);
       // TODO: validate if parent scopes match - otherwise source is invalid
+    }
+
+    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;
     }
 
@@ -444 +460 @@
     /// </summary>
     private static void TryAndRepeat(Action action, int repetitions, string errorMessage) {
-      while (repetitions > 0) {
-        try { action(); }
-        catch (Exception e) {
-          repetitions--;
-          if (repetitions == 0) {
-            throw new HiveEngineException(errorMessage, e);
-          }
-        }
-      }
-    }
-
-    private static void TryAndRepeat(Action action) {
-      TryAndRepeat(action, -1, string.Empty);
+      try { action(); }
+      catch (Exception e) {
+        repetitions--;
+        if (repetitions <= 0)
+          throw new HiveEngineException(errorMessage, e);
+        TryAndRepeat(action, repetitions, errorMessage);
+      }
     }
   }