Changeset 15262 for stable/HeuristicLab.Services.Hive/3.3/HiveService.cs
- Timestamp:
- 07/16/17 13:08:06 (7 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 14901,15121
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Services.Hive merged: 14901,15121
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Services.Hive/3.3/HiveService.cs
r14186 r15262 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.Paused 266 && task.State != DA.TaskState.Aborted 267 && task.State != DA.TaskState.Finished 268 && task.State != DA.TaskState.Failed) { 269 UpdateTaskState(pm, task, DT.TaskState.Paused, null, null, string.Empty); 270 } 267 271 pm.SubmitChanges(); 268 272 }); … … 962 966 var stateLogDao = pm.StateLogDao; 963 967 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) { 968 969 if (task.State == DA.TaskState.Calculating && taskStateEntity == DA.TaskState.Paused && task.Command == null) { 969 970 // slave paused and uploaded the task (no user-command) -> set waiting. 970 971 taskStateEntity = DA.TaskState.Waiting; 971 972 } 973 972 974 stateLogDao.Save(new DA.StateLog { 973 975 State = taskStateEntity, … … 978 980 Exception = exception 979 981 }); 982 980 983 task.State = taskStateEntity; 984 985 if (task.Command == DA.Command.Pause && task.State == DA.TaskState.Paused 986 || task.Command == DA.Command.Abort && task.State == DA.TaskState.Aborted 987 || task.Command == DA.Command.Stop && task.State == DA.TaskState.Aborted) { 988 task.Command = null; 989 } 981 990 } 982 991
Note: See TracChangeset
for help on using the changeset viewer.