Changeset 4810 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperiment.cs

Timestamp:

11/16/10 14:31:52 (13 years ago)

Author:

cneumuel

Message:

#1260

• changed dependency discovery machanism: now all locally loaded plugins will be dependencies for a job.
• fixed logging of slaveconsole by limiting the maximum log-messages
• minor bug fixes.

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperiment.cs (modified) (5 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperiment.cs

@@ -72 +72 @@
       get { return log; }
     }
-    
+
     private string resourceIds;
     public string ResourceIds {
@@ -83 +83 @@
       }
     }
-    
+
     private bool isPollingResults;
     public bool IsPollingResults {
@@ -465 +465 @@
             LogMessage(hj.JobDto.Id, "Downloading optimizer for job");
             OptimizerJob optimizerJob = LoadOptimizerJob(hj.JobDto.Id);
-            if (jobResult.ParentJobId.HasValue) {
-              HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(jobResult.ParentJobId.Value);
-              parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.JobDto.Id);
+            if (optimizerJob == null) {
+              // something bad happened to this job. set to finished to allow the rest beeing downloaded
+              hj.IsFinishedOptimizerDownloaded = true;
             } else {
-              this.HiveJob.IsFinishedOptimizerDownloaded = true;
+              if (jobResult.ParentJobId.HasValue) {
+                HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(jobResult.ParentJobId.Value);
+                parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.JobDto.Id);
+              } else {
+                this.HiveJob.IsFinishedOptimizerDownloaded = true;
+              }
             }
           }
@@ -584 +589 @@
         jobCount++;
         progress.Status = string.Format("Deserializing {0} of {1} jobs ({2} kb)...", jobCount, totalJobCount, allSerializedJobs[jobResult.Id].SerializedJobData.Count() / 1024);
-        OptimizerJob optimizerJob = SerializedJob.Deserialize<OptimizerJob>(allSerializedJobs[jobResult.Id].SerializedJobData);
+        OptimizerJob optimizerJob = null;
+        try {
+          optimizerJob = SerializedJob.Deserialize<OptimizerJob>(allSerializedJobs[jobResult.Id].SerializedJobData);
+        }
+        catch {
+          optimizerJob = null;
+        }
         progress.ProgressValue = (double)jobCount / totalJobCount;
         HiveJob childHiveJob = new HiveJob(optimizerJob, false);
@@ -598 +609 @@
       using (Disposable<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
         ResponseObject<SerializedJob> serializedJob = service.Obj.GetLastSerializedResult(jobId);
-        return SerializedJob.Deserialize<OptimizerJob>(serializedJob.Obj.SerializedJobData);
+        try {
+          return SerializedJob.Deserialize<OptimizerJob>(serializedJob.Obj.SerializedJobData);
+        }
+        catch {
+          return null;
+        }
       }
     }