Changeset 2078

Timestamp:

06/22/09 15:10:03 (15 years ago)

Author:

gkronber

Message:

Snapshot results should be ignored in the HiveGridServerWrapper. Using Canceled property of the engine to discriminate between snapshots and final results. #642 (Hive backend for CEDMA)

Location:

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2

Files:

• HeuristicLab.Grid.HiveBridge-3.2.csproj (modified) (1 diff)
• HiveGridServerWrapper.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HeuristicLab.Grid.HiveBridge-3.2.csproj

@@ -47 +47 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs

@@ -70 +70 @@
         response.Success && response.Obj != null) {
         HeuristicLab.Hive.Engine.Job restoredJob = (HeuristicLab.Hive.Engine.Job)PersistenceManager.RestoreFromGZip(response.Obj.Result);
-        // Serialize the engine
-        MemoryStream memStream = new MemoryStream();
-        GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
-        XmlDocument document = PersistenceManager.CreateXmlDocument();
-        Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
-        XmlNode rootNode = document.CreateElement("Root");
-        document.AppendChild(rootNode);
-        rootNode.AppendChild(PersistenceManager.Persist(restoredJob.Engine, document, dictionary));
-        document.Save(stream);
-        stream.Close();
-        return memStream.ToArray();
-      } else return null;
+        // only return the engine when it wasn't canceled (result is only a snapshot)
+        if (!restoredJob.Engine.Canceled) {
+          // Serialize the engine
+          MemoryStream memStream = new MemoryStream();
+          GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
+          XmlDocument document = PersistenceManager.CreateXmlDocument();
+          Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
+          XmlNode rootNode = document.CreateElement("Root");
+          document.AppendChild(rootNode);
+          rootNode.AppendChild(PersistenceManager.Persist(restoredJob.Engine, document, dictionary));
+          document.Save(stream);
+          stream.Close();
+          return memStream.ToArray();
+        }
+      }
+
+      return null;
     }