Changeset 7842 for branches/HeuristicLab.TimeSeries/HeuristicLab.Services.Hive

Timestamp:

05/16/12 16:28:49 (13 years ago)

Author:

gkronber

Message:

merged r7609:7840 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -44 +44 @@
       if (slave == null) {
         actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
-      } else {        
+      } else {
         if (heartbeat.HbInterval != slave.HbInterval) {
           actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
         }
-        
+
         // update slave data
         slave.FreeCores = heartbeat.FreeCores;
@@ -102 +102 @@
         // process the jobProgresses
         foreach (var jobProgress in heartbeat.JobProgress) {
-          Task curJob = dao.GetTask(jobProgress.Key);
-          if (curJob == null) {
+          Task curTask = dao.GetTask(jobProgress.Key);
+          if (curTask == null) {
             // task does not exist in db
             actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, jobProgress.Key));
-            DA.LogFactory.GetLogger(this.GetType().Namespace).Log("Job does not exist in DB: " + jobProgress.Key);
+            DA.LogFactory.GetLogger(this.GetType().Namespace).Log("Task on slave " + heartbeat.SlaveId + " does not exist in DB: " + jobProgress.Key);
           } else {
-            if (curJob.CurrentStateLog.SlaveId == Guid.Empty || curJob.CurrentStateLog.SlaveId != heartbeat.SlaveId) {
+            if (curTask.CurrentStateLog.SlaveId == Guid.Empty || curTask.CurrentStateLog.SlaveId != heartbeat.SlaveId) {
               // assigned slave does not match heartbeat
-              actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curJob.Id));
-              DA.LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate Job: " + curJob);
-            } else if (!TaskIsAllowedToBeCalculatedBySlave(heartbeat.SlaveId, curJob)) {
+              actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.Id));
+              DA.LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate task: " + curTask);
+            } else if (!TaskIsAllowedToBeCalculatedBySlave(heartbeat.SlaveId, curTask)) {
               // assigned resources ids of task do not match with slaveId (and parent resourceGroupIds); this might happen when slave is moved to different group
-              actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curJob.Id));
+              actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.Id));
             } else {
               // save task execution time
-              curJob.ExecutionTime = jobProgress.Value;
-              curJob.LastHeartbeat = DateTime.Now;
+              curTask.ExecutionTime = jobProgress.Value;
+              curTask.LastHeartbeat = DateTime.Now;
 
-              switch (curJob.Command) {
+              switch (curTask.Command) {
                 case Command.Stop:
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.StopTask, curJob.Id));
+                  actions.Add(new MessageContainer(MessageContainer.MessageType.StopTask, curTask.Id));
                   break;
                 case Command.Pause:
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curJob.Id));
+                  actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.Id));
                   break;
                 case Command.Abort:
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curJob.Id));
+                  actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.Id));
                   break;
               }
-              dao.UpdateTask(curJob);
+              dao.UpdateTask(curTask);
             }
           }