Changeset 15925 for branches/2839_HiveProjectManagement

Timestamp:

05/02/18 08:54:25 (7 years ago)

Author:

jzenisek

Message:

#2839: fixed bug in HeartbeatManager (more specific: corrected check if a task via its parenting job is still granted for a certain resource)

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -187 +187 @@
           actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
           LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not allowed to calculate any tasks tue to a downtime. The task is paused.");
-        } else if (assignedJobResourceDao.CheckJobGrantedForResource(curTask.JobId, heartbeat.SlaveId)) { 
-          // assigned resources ids of task do not match with slaveId (and parent resourceGroupIds); this might happen when slave is moved to different group
+        } else if (!assignedJobResourceDao.CheckJobGrantedForResource(curTask.JobId, heartbeat.SlaveId)) {
+          // slaveId (and parent resourceGroupIds) are not among the assigned resources ids for task-parenting job
+          // this might happen when (a) job-resource assignment has been changed (b) slave is moved to different group
           actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
           LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not granted to calculate task: " + curTask.TaskId + " of job: " + curTask.JobId);