Changeset 9636 for branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3

Timestamp:

06/17/13 13:47:00 (12 years ago)

Author:

pfleck

Message:

#2030:
Added changes as suggested from server review by ascheibe.

Location:

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3

Files:

• HiveService.cs (modified) (2 diffs)
• Manager/HeartbeatManager.cs (modified) (3 diffs)

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -222 +222 @@
         }
 
-        //optimizedDao.UpdateTaskAndPlugins(task); no idea why this is needed
         return DT.Convert.ToDto(task);
       });
@@ -394 +393 @@
 
         if (slave == null) {
-          var healGroup = dao.GetResources(x => x.Name == "HEAL").FirstOrDefault();
-          if (healGroup != null) {
-            slaveInfo.ParentResourceId = healGroup.Id;
-          }
           dao.AddSlave(slaveInfo);
         } else {

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -73 +73 @@
           dao.UpdateSlave(slave);
         });
-      }
 
-      if (slave != null) {
         // update task data
         actions.AddRange(UpdateTasks(heartbeat, slave.IsAllowedToCalculate));
@@ -94 +92 @@
                 if (availableTasks.Any()) {
                   var task = availableTasks.First();
-                  AssignJob(slave, task.TaskId);
+                  AssignTask(slave, task.TaskId);
                   actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, task.TaskId));
                 }
@@ -114 +112 @@
     }
 
-    private void AssignJob(Slave slave, Guid taskId) {
-      var task = dao.UpdateTaskState(taskId, DataAccess.TaskState.Transferring, slave.ResourceId, null, null);
+    private void AssignTask(Slave slave, Guid taskId) {
+      var task = dao.UpdateTaskState(taskId, TaskState.Transferring, slave.ResourceId, null, null);
 
       // from now on the task has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)