Changeset 412

Timestamp:

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

Author:

gkronber

Message:

fixed #212

Location:

trunk/sources

Files:

• HeuristicLab.DistributedEngine/DistributedEngine.cs (modified) (2 diffs)
• HeuristicLab.Grid/ClientForm.cs (modified) (1 diff)
• HeuristicLab.Grid/ProcessingEngine.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);
         }

trunk/sources/HeuristicLab.Grid/ClientForm.cs

@@ -151 +151 @@
 
     void currentEngine_Finished(object sender, EventArgs e) {
-      IEngine engine = (IEngine)sender;
+      ProcessingEngine engine = (ProcessingEngine)sender;
+
+      // if the engine was stopped because of an error it's not necessary to return the whole engine
+      // instead just return an empty engine that has the aborted flag set
+      if(engine.Canceled) {
+        engine.Reset();
+        engine.OperatorGraph.Clear();
+        engine.Abort();
+      }
+
       byte[] resultXml = SaveEngine(engine);
       bool success = false;

trunk/sources/HeuristicLab.Grid/ProcessingEngine.cs

@@ -48 +48 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlAttribute canceledAttr = document.CreateAttribute("Canceled");
+      canceledAttr.Value = Canceled.ToString();
+      node.Attributes.Append(canceledAttr);
       node.AppendChild(PersistenceManager.Persist("InitialOperation", initialOperation, document, persistedObjects));
       return node;
@@ -54 +57 @@
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
+      myCanceled = bool.Parse(node.Attributes["Canceled"].Value);
       initialOperation = (AtomicOperation)PersistenceManager.Restore(node.SelectSingleNode("InitialOperation"), restoredObjects);
     }