Changeset 5511 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Timestamp:

02/17/11 14:47:56 (14 years ago)

Author:

cneumuel

Message:

#1233

• added StateLog to log state transitions of hive jobs
• added permissions to hive experiments (in data access layer, no UI for that yet)
• extended unit tests

Location:

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

Files:

• Core.cs (modified) (4 diffs)
• Executor.cs (modified) (1 diff)
• WcfService.cs (modified) (3 diffs)

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

@@ -185 +185 @@
         engines[job.Id].Pause();
         JobData sJob = engines[job.Id].GetFinishedJob();
-        job.Exception = engines[job.Id].CurrentException;
+        // job.Exception = engines[job.Id].CurrentException; // can there be an exception if a job is paused
         job.ExecutionTime = engines[job.Id].ExecutionTime;
 
         try {
           ClientCom.LogMessage("Sending the paused job with id: " + job.Id);
-          wcfService.UpdateJob(job, sJob);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id);
           SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
         }
@@ -208 +208 @@
         engines[job.Id].Stop();
         JobData sJob = engines[job.Id].GetFinishedJob();
-        job.Exception = engines[job.Id].CurrentException;
+        // job.Exception = engines[job.Id].CurrentException; // can there be an exception if a job is stopped regularly
         job.ExecutionTime = engines[job.Id].ExecutionTime;
 
         try {
           ClientCom.LogMessage("Sending the stoppped job with id: " + job.Id);
-          wcfService.UpdateJob(job, sJob);
+          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id);
           SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
         }
@@ -345 +345 @@
       } else {
         Job job = Jobs[data.JobId];
-        job.JobState = JobState.WaitingForChildJobs;
-        wcfService.UpdateJob(job, data);
+        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.UpdateJob(job);
       }
       KillAppDomain(data.JobId);
@@ -372 +374 @@
         cJob.ExecutionTime = engines[jobId].ExecutionTime;
 
-        JobData sJob = engines[jobId].GetFinishedJob();
-        cJob.Exception = engines[jobId].CurrentException;
-        cJob.ExecutionTime = engines[jobId].ExecutionTime;
+        JobData sJob = engines[jId].GetFinishedJob();
+        // cJob.Exception = engines[jId].CurrentException; // can there be an exception if the job is sent normally. the exception should be entered in the statelog with the corresponding state (Failed)
+        cJob.ExecutionTime = engines[jId].ExecutionTime;
 
         try {
           ClientCom.LogMessage("Sending the finished job with id: " + jobId);
-          wcfService.UpdateJob(cJob, sJob);
+          wcfService.UpdateJobData(cJob, sJob, ConfigManager.Instance.GetClientInfo().Id);
           SlaveStatusInfo.JobsProcessed++;
         }

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

@@ -128 +128 @@
 
       Job childJob = new Job();
-      childJob.JobState = JobState.Offline;
+      childJob.SetState(JobState.Offline);
       childJob.CoresNeeded = 1;
       childJob.MemoryNeeded = 0;

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Clients.Common;
-using HeuristicLab.Clients.Hive.Slave.Properties;
 using HeuristicLab.Common;
 using HeuristicLab.Services.Hive.Common;
@@ -141 +140 @@
     }
 
+    public void UpdateJob(Job job) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
+        try {
+          service.Obj.UpdateJob(job);
+        }
+        catch (Exception ex) {
+          HandleNetworkError(ex);
+        }
+      }
+    }
+
     /// <summary>
     /// used on pause or if job finished to upload the job results
@@ -146 +156 @@
     /// <param name="job"></param>
     /// <param name="jobData"></param>    
-    public void UpdateJob(Job job, JobData jobData) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          service.Obj.UpdateJob(job, jobData);
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
-      }
-    }
-
+    public void UpdateJobData(Job job, JobData jobData, Guid slaveId) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
+        try {
+          JobState before = job.State;
+          job.SetState(JobState.Transferring, slaveId, "");
+          service.Obj.UpdateJob(job);
+
+          service.Obj.UpdateJobData(job, jobData);
+
+          job.SetState(before, slaveId, "");
+          service.Obj.UpdateJob(job);
+        }
+        catch (Exception ex) {
+          HandleNetworkError(ex);
+        }
+      }
+    }
+    
     public List<MessageContainer> SendHeartbeat(Heartbeat heartbeat) {
       using (Disposable<IHiveService> service = GetSlaveService()) {