Changeset 5636 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

03/08/11 14:54:17 (14 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)

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Files:

• HeartbeatManager.cs (modified) (2 diffs)
• HiveService.cs (modified) (5 diffs)
• LifecycleManager.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs

@@ -53 +53 @@
 
     private void AssignJob(Slave slave, Job job) {
-      job.SetState(JobState.Transferring, slave.Id, "");
-      dao.UpdateJob(job);
+      dao.UpdateJobState(job.Id, JobState.Transferring, slave.Id, null, null);
       dao.UpdateSlave(slave);
     }
@@ -88 +87 @@
               // a request to abort the job has been set
               actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            } else if (curJob.State != JobState.Calculating) {
-              // jobstate was 'Transferring' before, now calculating
-              curJob.SetState(JobState.Calculating, heartbeat.SlaveId, "");
             }
             dao.UpdateJob(curJob);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -36 +36 @@
     public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
       using (trans.OpenTransaction()) {
-        job.SetState(JobState.Waiting, auth.UserId);
         job.Id = dao.AddJob(job);
         jobData.JobId = job.Id;
@@ -48 +47 @@
         }
         dao.AddJobData(jobData);
+        dao.UpdateJobState(job.Id, JobState.Waiting, null, auth.UserId, null);
         return jobData.JobId;
       }
@@ -135 +135 @@
     }
 
+    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
+      using (trans.OpenTransaction()) {
+        return dao.UpdateJobState(jobId, jobState, slaveId, userId, exception);
+      }
+    }
     #endregion
 
@@ -235 +243 @@
     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
-      TriggerLifecycle();
+      TriggerLifecycle(false);
 
       using (trans.OpenTransaction()) {
@@ -391 +399 @@
     }
 
-    public void TriggerLifecycle() {
+    public void TriggerLifecycle(bool force) {
       using (trans.OpenTransaction()) {
         DateTime lastCleanup = dao.GetLastCleanup();
-        if (DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
+        if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
           dao.SetLastCleanup(DateTime.Now);
           lifecycleManager.Cleanup();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs

@@ -48 +48 @@
       var parentJobsToFinish = dao.GetParentJobs(dao.GetResources(x => true).Select(x => x.Id), 0, true);
       foreach (var job in parentJobsToFinish) {
-        job.SetState(JobState.Finished);
-        dao.UpdateJob(job);
+        dao.UpdateJobState(job.Id, JobState.Finished, null, null, string.Empty);
       }
     }