Changeset 1812 for trunk/sources

Timestamp:

05/14/09 16:55:47 (16 years ago)

Author:

kgrading

Message:

changed job restart behaviour - the job will now be restarted when the serialization is done, not before (#571)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

@@ -249 +249 @@
     #endregion  */
 
-    public ResponseResultReceived SendStoredJobResultsSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
+    public ResponseResultReceived SendStoredJobResultsSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {      
       return proxy.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);    
+    }
+
+    public ResponseResultReceived ProcessSnapshotSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception) {
+      try {
+        ResponseResultReceived res = proxy.ProcessSnapshot(clientId, jobId, result, percentage, null);
+        Logging.Instance.Info(this.ToString(), "Snapshot for Job " + jobId + " submitted");
+        return res;
+      }
+      catch (Exception e) {
+        HandleNetworkError(e);
+        return null;
+      }
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -192 +192 @@
       Guid jId = (Guid)jobId;
       byte[] obj = engines[jId].GetSnapshot();
-      wcfService.ProcessSnapshotAsync(ConfigManager.Instance.GetClientInfo().Id,
+      wcfService.ProcessSnapshotSync(ConfigManager.Instance.GetClientInfo().Id,
         jId,
         obj,
         engines[jId].Progress,
-        null,
-        false);
+        null);
+      engines[jId].StartOnlyJob();
     }
 

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs

@@ -65 +65 @@
     }
 
+    public void StartOnlyJob() {
+      Job.Start();
+    }
+
     public void Abort() {
       CurrentMessage = MessageContainer.MessageType.AbortJob;
@@ -89 +93 @@
         byte[] job = SerializeJobObject();        
         // Restart the job
-        Job.Start();
         // Return the Snapshot
         return job;