Changeset 413 for trunk/sources/HeuristicLab.DistributedEngine

Timestamp:

07/31/08 10:07:09 (17 years ago)

Author:

gkronber

Message:

fixed #218 (DistributedEngine silently ignores when grid-jobs are canceled (because of exceptions) on grid-clients) by adding a property that holds an error message to the ProcessingEngine

File:

• trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

@@ -127 +127 @@
               }
             }
+
+            CompositeOperation canceledOperations = new CompositeOperation();
+            canceledOperations.ExecuteInParallel = true;
             // retrieve results and merge into scope-tree
             foreach(AtomicOperation parOperation in compositeOperation.Operations) {
               ProcessingEngine resultEngine = jobManager.EndExecuteOperation(parOperation);
               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.
-                // so just push the original parallel operation back on the stack to force local execution.
-                ExecutionStack.Push(parOperation);
+                ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(new JobExecutionException(resultEngine.ErrorMessage)); });
+                canceledOperations.AddOperation(parOperation);
               } else {
                 // if everything went fine we can merge the results into our local scope-tree
                 MergeScope(parOperation.Scope, resultEngine.InitialOperation.Scope);
               }
+            }
+
+            if(canceledOperations.Operations.Count > 0) {
+              myExecutionStack.Push(canceledOperations);
+              Abort();
             }
           } catch(Exception e) {