- Timestamp:
- 05/02/17 09:41:39 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs
r14185 r14901 263 263 if (task.State == DA.TaskState.Calculating || task.State == DA.TaskState.Transferring) { 264 264 task.Command = DA.Command.Pause; 265 } 266 UpdateTaskState(pm, task, DT.TaskState.Paused, null, null, string.Empty); 265 } else if (task.State != DA.TaskState.Aborted 266 && task.State != DA.TaskState.Finished 267 && task.State != DA.TaskState.Failed) { 268 UpdateTaskState(pm, task, DT.TaskState.Paused, null, null, string.Empty); 269 } 267 270 pm.SubmitChanges(); 268 271 }); … … 962 965 var stateLogDao = pm.StateLogDao; 963 966 var taskStateEntity = taskState.ToEntity(); 964 if (task.Command == DA.Command.Pause && task.State == DA.TaskState.Paused 965 || task.Command == DA.Command.Abort && task.State == DA.TaskState.Aborted 966 || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) { 967 task.Command = null; 968 } else if (taskStateEntity == DA.TaskState.Paused && task.Command == null) { 967 968 if (taskStateEntity == DA.TaskState.Paused && task.Command == null) { 969 969 // slave paused and uploaded the task (no user-command) -> set waiting. 970 970 taskStateEntity = DA.TaskState.Waiting; 971 971 } 972 972 973 stateLogDao.Save(new DA.StateLog { 973 974 State = taskStateEntity, … … 978 979 Exception = exception 979 980 }); 981 980 982 task.State = taskStateEntity; 983 984 if (task.Command == DA.Command.Pause && task.State == DA.TaskState.Paused 985 || task.Command == DA.Command.Abort && task.State == DA.TaskState.Aborted 986 || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) { 987 task.Command = null; 988 } 981 989 } 982 990
Note: See TracChangeset
for help on using the changeset viewer.