Changeset 6110 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs

Timestamp:

05/03/11 17:08:54 (13 years ago)

Author:

cneumuel

Message:

#1233

• renamed engines to executors
• changed locking in StartJobInAppDomain
• avoid destruction of proxy object after 5 minutes for Slave.Core
• added JobStarted event and fixed ExecutionStateChanged and ExecutionTimeChanged
• slaves which are moved to another slavegroup will pause their jobs now, if they must not calculate them

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs (modified) (2 diffs)

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

@@ -82 +82 @@
             actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
             LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate Job: " + curJob);
+          } else if (!JobIsAllowedToBeCalculatedBySlave(heartbeat.SlaveId, curJob)) {
+            // assigned resources ids of job do not match with slaveId (and parent resourceGroupIds); this might happen when slave is moved to different group
+            actions.Add(new MessageContainer(MessageContainer.MessageType.PauseJob, curJob.Id));
           } else {
             // save job execution time
@@ -104 +107 @@
       return actions;
     }
+
+    private bool JobIsAllowedToBeCalculatedBySlave(Guid slaveId, Job curJob) {
+      var assignedResourceIds = dao.GetAssignedResources(curJob.Id).Select(x => x.Id);
+      var slaveResourceIds = dao.GetParentResources(slaveId).Select(x => x.Id);
+      return assignedResourceIds.Any(x => slaveResourceIds.Contains(x));
+    }
   }
 }