Changeset 17575 for trunk

Timestamp:

05/29/20 13:31:30 (4 years ago)

Author:

jkarder

Message:

#3072: fixed statelog updates

• fixed UpdateTasks so that it selects the correct last slave id for a specified task
• introduced check if a slave is allowed to update a task's state (IsAuthorizedForTask)

Location:

trunk/HeuristicLab.Services.Hive/3.3

Files:

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

trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -209 +209 @@
     }
 
+    private bool IsAuthorizedForTask(DA.Task task, Guid? slaveId) {
+      var lastStateLog = task.StateLogs.OrderByDescending(x => x.DateTime).FirstOrDefault(x => x.State == DA.TaskState.Transferring);
+      return lastStateLog == null || slaveId == null || lastStateLog.SlaveId == slaveId;
+    }
+
     public DT.Task UpdateTaskState(Guid taskId, DT.TaskState taskState, Guid? slaveId, Guid? userId, string exception) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
@@ -217 +222 @@
         return pm.UseTransaction(() => {
           var task = taskDao.GetById(taskId);
-          UpdateTaskState(pm, task, taskState, slaveId, userId, exception);
-          pm.SubmitChanges();
+          if (IsAuthorizedForTask(task, slaveId)) {
+            UpdateTaskState(pm, task, taskState, slaveId, userId, exception);
+            pm.SubmitChanges();
+          }
           return task.ToDto();
         });

trunk/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -120 +120 @@
       var taskInfos = pm.UseTransaction(() =>
         (from task in taskDao.GetAll()
-          where taskIds.Contains(task.TaskId)
-          let lastStateLog = task.StateLogs.OrderByDescending(x => x.DateTime).FirstOrDefault()
-          select new {
-            TaskId = task.TaskId,
-            JobId = task.JobId,
-            State = task.State,
-            Command = task.Command,
-            SlaveId = lastStateLog != null ? lastStateLog.SlaveId : default(Guid)
-          }).ToList()
+         where taskIds.Contains(task.TaskId)
+         let lastStateLog = task.StateLogs.OrderByDescending(x => x.DateTime).FirstOrDefault(x => x.State == DA.TaskState.Transferring)
+         select new {
+           TaskId = task.TaskId,
+           JobId = task.JobId,
+           State = task.State,
+           Command = task.Command,
+           SlaveId = lastStateLog != null ? lastStateLog.SlaveId : Guid.Empty
+         }).ToList()
       );