Changeset 4772 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

Timestamp:

11/11/10 15:30:03 (13 years ago)

Author:

cneumuel

Message:

#1260

• added LogServiceReader to display log for slave without writing to local files
• aborted jobs with childjobs now got back to state WaitForChildJob (instead of Offline)
• lifecyclemanager now knows about available plugins (does not yet work perfectly)

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

@@ -173 +173 @@
         MemoryStream memStream = null;
         try {
-          if (ar.IsCompleted) {
-            Logger.Debug("ENDED: Fetching of Jobs from Server for Slave");
-            stream = service.Obj.EndGetStreamedJob(ar);
-
-            //first deserialize the response
-            BinaryFormatter formatter = new BinaryFormatter();
-            ResponseObject<JobDto> response = (ResponseObject<JobDto>)formatter.Deserialize(stream);
-
-            //second deserialize the BLOB
-            memStream = new MemoryStream();
-
-            byte[] buffer = new byte[3024];
-            int read = 0;
-            while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
-              memStream.Write(buffer, 0, read);
-            }
-
-            memStream.Close();
-
-            GetJobCompletedEventArgs completedEventArgs = new GetJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, null, !ar.IsCompleted, ar.AsyncState);
-            GetJobCompleted(this, completedEventArgs);
-
-          } else {
-            HandleNetworkError(new FaultException("GetJobAsync did not complete"));
+          Logger.Debug("ENDED: Fetching of Jobs from Server for Slave");
+          stream = service.Obj.EndGetStreamedJob(ar);
+
+          //first deserialize the response
+          BinaryFormatter formatter = new BinaryFormatter();
+          ResponseObject<JobDto> response = (ResponseObject<JobDto>)formatter.Deserialize(stream);
+
+          //second deserialize the BLOB
+          memStream = new MemoryStream();
+
+          byte[] buffer = new byte[3024];
+          int read = 0;
+          while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
+            memStream.Write(buffer, 0, read);
           }
+
+          memStream.Close();
+
+          GetJobCompletedEventArgs completedEventArgs = new GetJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, null, !ar.IsCompleted, ar.AsyncState);
+          GetJobCompleted(this, completedEventArgs);
         }
         catch (Exception e) {
@@ -236 +231 @@
             stream.Dispose();
 
-          if (ar.IsCompleted) {
-            var res = service.Obj.EndStoreFinishedJobResultStreamed(ar);
-            StoreFinishedJobResultCompletedEventArgs args = new StoreFinishedJobResultCompletedEventArgs(new object[] { res }, null, false, null);
-            Logger.Debug("calling the Finished Job Event");
-            GetFinishedJobResultCompleted(this, args);
-            Logger.Debug("ENDED: Sending back the finished job results");
-          } else {
-            HandleNetworkError(new FaultException("GetFinishedJobResultAsync did not complete"));
-          }
+          var res = service.Obj.EndStoreFinishedJobResultStreamed(ar);
+          StoreFinishedJobResultCompletedEventArgs args = new StoreFinishedJobResultCompletedEventArgs(new object[] { res }, null, false, null);
+          Logger.Debug("calling the Finished Job Event");
+          GetFinishedJobResultCompleted(this, args);
+          Logger.Debug("ENDED: Sending back the finished job results");
         }
         catch (Exception e) {
@@ -269 +260 @@
             stream.Dispose();
 
-          if (ar.IsCompleted) {
-            var res = service.Obj.EndStoreFinishedJobResultStreamed(ar);
-            ProcessSnapshotCompletedEventArgs args = new ProcessSnapshotCompletedEventArgs(new object[] { res }, null, false, null);
-            ProcessSnapshotCompleted(this, args);
-          } else {
-            HandleNetworkError(new FaultException("ProcessSnapshotAsync did not complete"));
-          }
+          var res = service.Obj.EndStoreFinishedJobResultStreamed(ar);
+          ProcessSnapshotCompletedEventArgs args = new ProcessSnapshotCompletedEventArgs(new object[] { res }, null, false, null);
+          ProcessSnapshotCompleted(this, args);
         }
         catch (Exception e) {