Changeset 412 for trunk/sources/HeuristicLab.DistributedEngine

Timestamp:

07/31/08 00:15:31 (17 years ago)

Author:

gkronber

Message:

fixed #212

File:

• trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

@@ -130 +130 @@
             foreach(AtomicOperation parOperation in compositeOperation.Operations) {
               ProcessingEngine resultEngine = jobManager.EndExecuteOperation(parOperation);
-              if(resultEngine.ExecutionStack.Count > 0) {
-                // when there are operations left in the execution stack it means that the engine has been aborted
-                // for unkown reason. Probably there was a problem at the client, so we can try to execute the steps locally.
+              if(resultEngine.Canceled) {
+                // When the engine was canceled because of a problem at the client we can try to execute the steps locally.
                 // If they also fail the (local) distributued-engine will be aborted and we will see an error-message.
-                // Solution: We could push all waiting operations in the execution stack of the result engine into our own
-                // execution stack, but this is not easy because we have to change the operations to point to the 
-                // original scopes instead of the new scopes (created while deserializing the processing engine).
-                // Instead just push the original parallel operation back on the stack to force local execution.
+                // so just push the original parallel operation back on the stack to force local execution.
                 ExecutionStack.Push(parOperation);
               } else {
@@ -182 +178 @@
         prunedScopes.Add(subScopes);
         // remove all my sub-scopes
-        foreach(IScope subScope in subScopes) { 
+        foreach(IScope subScope in subScopes) {
           currentScope.RemoveSubScope(subScope);
         }