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

Timestamp:

03/21/11 15:05:48 (14 years ago)

Author:

cneumuel

Message:

#1233

• implemented pause, stop for single jobs
• introduced Command property for jobs (to distinguish between state and command (abort vs. aborted))
• improved behaviour of ItemTreeView (double click opens new window, selected item stays marked)
• fixed bugs in StateLogGanttChartListView and HiveJobView
• fixed cloning of client-side dtos

Location:

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

Files:

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

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

@@ -39 +39 @@
 
         // assign new job
-        if (heartbeat.AssignJob && this.IsAllowedToSendJobs() && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
+        if (heartbeat.AssignJob && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
           var availableJobs = dao.GetWaitingJobs(slave, 1);
           if (availableJobs.Count() > 0) {
@@ -83 +83 @@
             curJob.LastHeartbeat = DateTime.Now;
 
-            if (curJob.State == JobState.Aborted) {
-              // a request to abort the job has been set
-              actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
+            switch (curJob.Command) {
+              case Command.Stop:
+                actions.Add(new MessageContainer(MessageContainer.MessageType.StopJob, curJob.Id));
+                break;
+              case Command.Pause:
+                actions.Add(new MessageContainer(MessageContainer.MessageType.PauseJob, curJob.Id));
+                break;
+              case Command.Abort:
+                actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
+                break;
             }
             dao.UpdateJob(curJob);
@@ -93 +100 @@
       return actions;
     }
-
-    /// <summary>
-    /// Returns true if there are enough resources to send a job
-    /// There should not be too many jobs sent simultaniously
-    /// </summary>
-    private bool IsAllowedToSendJobs() {
-      return true; // JobsCurrentlyTransferring < ApplicationConstants.MaxJobTransferCount;
-      // Todo: see if unlimited job transfer count works. if not, look into db and count jobs in state Transferring
-    }
   }
 }

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

@@ -139 +139 @@
     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
-      return trans.UseTransaction(() => dao.UpdateJobState(jobId, jobState, slaveId, userId, exception));
+      return trans.UseTransaction(() => {
+        Job job = dao.UpdateJobState(jobId, jobState, slaveId, userId, exception);
+        if (job.Command.HasValue && job.Command.Value == Command.Pause && job.State == JobState.Paused) {
+          job.Command = null;
+        } else if (job.Command.HasValue && job.Command.Value == Command.Abort && job.State == JobState.Aborted) {
+          job.Command = null;
+        } else if (job.Command.HasValue && job.Command.Value == Command.Stop && job.State == JobState.Aborted) {
+          job.Command = null;
+        }
+        dao.UpdateJob(job);
+        return job;
+      });
     }
     #endregion
@@ -149 +160 @@
     public void StopJob(Guid jobId) {
       trans.UseTransaction(() => {
-        throw new NotImplementedException();
+        //dao.UpdateJobState(jobId, JobState.Aborted, null, auth.UserId, string.Empty);
+        var job = dao.GetJob(jobId);
+        job.Command = Command.Stop;
+        dao.UpdateJob(job);
       });
     }
@@ -158 +172 @@
     public void PauseJob(Guid jobId) {
       trans.UseTransaction(() => {
-        throw new NotImplementedException();
+        //dao.UpdateJobState(jobId, JobState.Paused, null, auth.UserId, string.Empty);
+        var job = dao.GetJob(jobId);
+        job.Command = Command.Pause;
+        dao.UpdateJob(job);
+      });
+    }
+
+    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public void RestartJob(Guid jobId) {
+      trans.UseTransaction(() => {
+        Job job = dao.UpdateJobState(jobId, JobState.Waiting, null, auth.UserId, string.Empty);
+        job.Command = null;
+        dao.UpdateJob(job);
       });
     }

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

@@ -55 +55 @@
       var jobs = dao.GetJobs(x => x.State == JobState.Calculating).Where(x => x.StateLog.Last().SlaveId == slaveId);
       foreach (var j in jobs) {
-        dao.UpdateJobState(j.Id, JobState.Waiting, slaveId, null, "Slave timed out");
+        Job job = dao.UpdateJobState(j.Id, JobState.Waiting, slaveId, null, "Slave timed out");
+        job.Command = null;
+        dao.UpdateJob(job);
       }
     }