Changeset 5636 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

Timestamp:

03/08/11 14:54:17 (13 years ago)

Author:

cneumuel

Message:

#1233

• updated jobstates documentation
• enhanced ganttChart
• fixed setting of jobstates
• added option to force lifecycle-trigger (mainly for testing purposes)

File:

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

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

@@ -140 +140 @@
         switch (container.Message) {
           case MessageContainer.MessageType.CalculateJob:
-            Job myJob = wcfService.GetJob(container.JobId);
-            //TODO: handle in own thread!!
-            JobData jobData = wcfService.GetJobData(myJob.Id);
-            StartJobInAppDomain(myJob, jobData);
+            Job job = wcfService.GetJob(container.JobId);
+            JobData jobData = wcfService.GetJobData(job.Id);
+            job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null);
+            StartJobInAppDomain(job, jobData);
             break;
           case MessageContainer.MessageType.ShutdownSlave:
@@ -181 +181 @@
     }
 
-    private void DoPauseJob(Guid guid) {
-      Job job = Jobs[guid];
+    private void DoPauseJob(Guid jobId) {
+      Job job = Jobs[jobId];
 
       if (job != null) {
@@ -192 +192 @@
         try {
           ClientCom.LogMessage("Sending the paused job with id: " + job.Id);
-          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Paused);
           SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
         }
@@ -215 +215 @@
         try {
           ClientCom.LogMessage("Sending the stoppped job with id: " + job.Id);
-          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Paused);
           SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
         }
@@ -347 +347 @@
       } else {
         Job job = Jobs[data.JobId];
-        job.SetState(JobState.Transferring);
-        wcfService.UpdateJobData(job, data, ConfigManager.Instance.GetClientInfo().Id);
-        job.SetState(JobState.Waiting); // todo: what if it was a ResumeOnChildJobsFinished job before? maybe look into StateLog
+        wcfService.UpdateJobData(job, data, ConfigManager.Instance.GetClientInfo().Id, JobState.Paused);
+        job.SetState(JobState.Waiting);
         wcfService.UpdateJob(job);
       }
@@ -373 +372 @@
         }
         Job cJob = jobs[jobId];
-        cJob.State = JobState.Finished; // TODO: what if failed?
         cJob.ExecutionTime = engines[jobId].ExecutionTime;
 
@@ -382 +380 @@
         try {
           ClientCom.LogMessage("Sending the finished job with id: " + jobId);
-          wcfService.UpdateJobData(cJob, sJob, ConfigManager.Instance.GetClientInfo().Id);
+          wcfService.UpdateJobData(cJob, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
           SlaveStatusInfo.JobsProcessed++;
         }