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

Timestamp:

06/16/11 00:06:54 (13 years ago)

Author:

cneumuel

Message:

#1233

• created events when statelog changed
• fixed memory leak in hiveengine
• extended timeout for long running transactions and database contexts (when jobdata is stored)
• replaced random guids in database with sequential guids for performance reasons
• minor fixes and cleanups

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (3 diffs)

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

@@ -196 +196 @@
           //} else 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();
-            parentScopeClone.SubScopes.Clear();
-            parentScopeClone.ClearParentScopes();
-
-            EngineJob[] jobs = new EngineJob[coll.Count];
-            for (int i = 0; i < coll.Count; i++) {
-              jobs[i] = new EngineJob(coll[i], new SequentialEngine.SequentialEngine());
+            try {
+              // 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();
+              parentScopeClone.SubScopes.Clear();
+              parentScopeClone.ClearParentScopes();
+
+              EngineJob[] jobs = new EngineJob[coll.Count];
+              for (int i = 0; i < coll.Count; i++) {
+                jobs[i] = new EngineJob(coll[i], new SequentialEngine.SequentialEngine());
+              }
+
+              var experiment = CreateHiveExperiment();
+              IScope[] scopes = ExecuteOnHive(experiment, jobs, parentScopeClone, cancellationToken);
+
+              for (int i = 0; i < coll.Count; i++) {
+                if (coll[i] is IAtomicOperation) {
+                  ExchangeScope(scopes[i], ((IAtomicOperation)coll[i]).Scope);
+                } else if (coll[i] is OperationCollection) {
+                  // todo ??
+                }
+              }
             }
-
-            var experiment = CreateHiveExperiment();
-            IScope[] scopes = ExecuteOnHive(experiment, jobs, parentScopeClone, cancellationToken);
-            DisposeHiveExperiment(experiment);
-
-            for (int i = 0; i < coll.Count; i++) {
-              if (coll[i] is IAtomicOperation) {
-                ExchangeScope(scopes[i], ((IAtomicOperation)coll[i]).Scope);
-              } else if (coll[i] is OperationCollection) {
-                // todo ??
-              }
+            catch {
+              executionStack.Push(coll); throw;
             }
           } else {
@@ -305 +309 @@
 
         var failedJobs = hiveExperiment.HiveJobs.Where(x => x.Job.State == JobState.Failed);
-        if(failedJobs.Count() > 0) {
+        if (failedJobs.Count() > 0) {
           throw new HiveEngineException("Job failed: " + failedJobs.First().Job.StateLog.Last().Exception);
         }
@@ -318 +322 @@
       }
       catch (OperationCanceledException e) {
-        lock (locker) {
-          DeleteHiveExperiment(hiveExperiment.Id);
-        }
         throw e;
       }
       catch (Exception e) {
-        lock (locker) {
-          DeleteHiveExperiment(hiveExperiment.Id);
-        }
         LogException(e);
         throw e;
+      }
+      finally {
+        DisposeHiveExperiment(refreshableHiveExperiment);
       }
     }