Changeset 6216 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs

Timestamp:

05/17/11 11:26:48 (13 years ago)

Author:

ascheibe

Message:

#1233

• make UsedCores more reliable
• some cosmetic fixes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs (modified) (13 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs

@@ -34 +34 @@
     }
 
-    public void CalculateJob(Guid jobId) {
+    public void PrepareJob(Guid jobId) {
+      JobId = jobId;
       Job job = wcfService.GetJob(jobId);
       if (job == null) throw new JobNotFoundException(jobId);
       coresNeeded = job.CoresNeeded;
       SlaveStatusInfo.IncrementUsedCores(coresNeeded);
+    }
+
+    public void CalculateJob() {
+      Job job = wcfService.GetJob(JobId);
+      if (job == null) throw new JobNotFoundException(JobId);
 
       JobData jobData = wcfService.GetJobData(job.Id);
-      if (jobData == null) throw new JobDataNotFoundException(jobId);
+      if (jobData == null) throw new JobDataNotFoundException(JobId);
       SlaveStatusInfo.IncrementJobsFetched();
       job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null);
-      if (job == null) throw new JobNotFoundException(jobId);
+      if (job == null) throw new JobNotFoundException(JobId);
       StartJobInAppDomain(job, jobData);
     }
@@ -66 +72 @@
             SlaveStatusInfo.IncrementJobsAborted();
 
-            clientCom.LogMessage("Sending the stopped job with id: " + job.Id);
+            clientCom.LogMessage(string.Format("Sending the stopped job with id: {0}", job.Id));
             wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Aborted);
           }
           catch (Exception e) {
-            clientCom.LogMessage("Transmitting to server failed. Storing the paused job with id: " + job.Id + " to hdd (" + e.ToString() + ")");
+            clientCom.LogMessage(string.Format("Transmitting the stopped job with id {0} to server failed. Exception is: {1}", job.Id, e.ToString()));
           }
           finally {
@@ -101 +107 @@
           }
           catch (Exception e) {
-            clientCom.LogMessage("Transmitting to server failed. Storing the paused job with id: " + job.Id + " to hdd (" + e.ToString() + ")");
+            clientCom.LogMessage(string.Format("Transmitting the paused job with id {0} to server failed. Exception is: {1}", job.Id, e.ToString()));
           }
           finally {
@@ -138 +144 @@
     public void SendFinishedJob() {
       try {
-        clientCom.LogMessage("Getting the finished job with id: " + JobId);
+        clientCom.LogMessage(string.Format("Getting the finished job with id: {0} ", JobId));
         if (executor == null) {
           clientCom.LogMessage(string.Format("SendFinishedJob: Can't pause job with id {0} with uninitialized executor", JobId));
@@ -159 +165 @@
         try {
           JobData sJob = executor.GetFinishedJob();
-          clientCom.LogMessage("Sending the finished job with id: " + JobId);
+          clientCom.LogMessage(string.Format("Sending the finished job with id: {0}", JobId));
           wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
         }
         catch (Exception e) {
-          clientCom.LogMessage("Transmitting to server failed. Storing the finished job with id: " + JobId + " to hdd (" + e.ToString() + ")");
+          clientCom.LogMessage(string.Format("Transmitting the job with id {0} to server failed. Exception is: {1}", job.Id, e.ToString()));
         }
         finally {
@@ -171 +177 @@
       }
       catch (Exception e) {
-        clientCom.LogMessage("SendFinishedJob: The following exception has been thrown: " + e.ToString());
+        clientCom.LogMessage(string.Format("SendFinishedJob: The following exception has been thrown: {0}", e.ToString()));
       }
     }
@@ -181 +187 @@
       JobId = job.Id;
 
-      clientCom.LogMessage("Received new job with id " + job.Id);
+      clientCom.LogMessage(string.Format("Received new job with id {0}", job.Id));
       clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
 
@@ -190 +196 @@
       try {
         PluginCache.Instance.PreparePlugins(job, out configFileName);
-        clientCom.LogMessage("Plugins fetched for job " + job.Id);
+        clientCom.LogMessage(string.Format("Plugins fetched for job {0}", job.Id));
         pluginsPrepared = true;
       }
@@ -214 +220 @@
           executor.CoresNeeded = job.CoresNeeded;
           executor.MemoryNeeded = job.MemoryNeeded;
-          clientCom.LogMessage("Starting Executor for job " + job.Id);
+          clientCom.LogMessage(string.Format("Starting Executor for job {0}", job.Id));
 
           executor.Start(jobData.Data);
@@ -222 +228 @@
         }
         catch (Exception exception) {
-          clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + job.Id);
-          clientCom.LogMessage("Error thrown is: " + exception.ToString());
+          clientCom.LogMessage(string.Format("Creating the Appdomain and loading the job failed for job {0}", job.Id));
+          clientCom.LogMessage(string.Format("Error thrown is: {0}", exception.ToString()));
 
           if (executor != null && executor.CurrentException != string.Empty) {
@@ -243 +249 @@
     /// <param name="JobId">the GUID of the job</param>    
     public void KillAppDomain() {
-      clientCom.LogMessage("Shutting down Appdomain for Job " + JobId);
+      clientCom.LogMessage(string.Format("Shutting down Appdomain for Job {0}", JobId));
 
       try {
@@ -280 +286 @@
       }
       catch (Exception ex) {
-        clientCom.LogMessage("Exception when unloading the appdomain: " + ex.ToString());
+        clientCom.LogMessage(string.Format("Exception when unloading the appdomain: {0}", ex.ToString()));
       }
       finally {
@@ -291 +297 @@
 
     private void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
-      clientCom.LogMessage("Exception in AppDomain: " + e.ExceptionObject.ToString());
+      clientCom.LogMessage(string.Format("Exception in AppDomain: ", e.ExceptionObject.ToString()));
       KillAppDomain();
     }