Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

Timestamp:

09/08/11 13:41:25 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed Job to Task

File:

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

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

@@ -71 +71 @@
 
     // returns true if assignment was successful
-    private bool AssignJob(Slave slave, Job job) {
+    private bool AssignJob(Slave slave, Task job) {
       // load job again and check if it is still available (this is an attempt to reduce the race condition which causes multiple heartbeats to get the same job assigned)
-      if (dao.GetJob(job.Id).State != JobState.Waiting) return false;
+      if (dao.GetJob(job.Id).State != TaskState.Waiting) return false;
 
-      job = dao.UpdateJobState(job.Id, DataAccess.JobState.Transferring, slave.Id, null, null);
+      job = dao.UpdateJobState(job.Id, DataAccess.TaskState.Transferring, slave.Id, null, null);
 
       // from now on the job has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)
@@ -98 +98 @@
         // process the jobProgresses
         foreach (var jobProgress in heartbeat.JobProgress) {
-          Job curJob = dao.GetJob(jobProgress.Key);
+          Task curJob = dao.GetJob(jobProgress.Key);
           if (curJob == null) {
             // job does not exist in db
@@ -135 +135 @@
     }
 
-    private bool JobIsAllowedToBeCalculatedBySlave(Guid slaveId, Job curJob) {
+    private bool JobIsAllowedToBeCalculatedBySlave(Guid slaveId, Task curJob) {
       var assignedResourceIds = dao.GetAssignedResources(curJob.Id).Select(x => x.Id);
       var slaveResourceIds = dao.GetParentResources(slaveId).Select(x => x.Id);