- Timestamp:
- 06/04/20 15:55:13 (4 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
/trunk merged: 17574-17576,17579-17581,17583-17585
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Clients.Hive.Slave merged: 17576
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs
r17226 r17586 251 251 TaskData taskData = wcfService.GetTaskData(taskId); 252 252 if (taskData == null) throw new TaskDataNotFoundException(taskId); 253 task = wcfService.Update JobState(taskId, TaskState.Calculating, null);253 task = wcfService.UpdateTaskState(taskId, TaskState.Calculating, null); 254 254 if (task == null) throw new TaskNotFoundException(taskId); 255 255 taskManager.StartTaskAsync(task, taskData); … … 268 268 } 269 269 catch (OutOfCoresException) { 270 wcfService.Update JobState(taskId, TaskState.Waiting, "No more cores available");270 wcfService.UpdateTaskState(taskId, TaskState.Waiting, "No more cores available"); 271 271 throw; 272 272 } 273 273 catch (OutOfMemoryException) { 274 wcfService.Update JobState(taskId, TaskState.Waiting, "No more memory available");274 wcfService.UpdateTaskState(taskId, TaskState.Waiting, "No more memory available"); 275 275 throw; 276 276 } 277 277 catch (Exception e) { 278 278 SlaveStatusInfo.DecrementUsedCores(usedCores); 279 wcfService.Update JobState(taskId, TaskState.Failed, e.ToString());279 wcfService.UpdateTaskState(taskId, TaskState.Failed, e.ToString()); 280 280 throw; 281 281 } … … 391 391 wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Failed, exception.ToString()); 392 392 } else { 393 wcfService.Update JobState(task.Id, TaskState.Failed, exception.ToString());393 wcfService.UpdateTaskState(task.Id, TaskState.Failed, exception.ToString()); 394 394 } 395 395 SlaveClientCom.Instance.LogMessage(exception.Message); … … 408 408 var slaveTask = e.Value; 409 409 var task = wcfService.GetTask(slaveTask.TaskId); 410 wcfService.Update JobState(task.Id, TaskState.Aborted, null);410 wcfService.UpdateTaskState(task.Id, TaskState.Aborted, null); 411 411 SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded); 412 412 } -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs
r17226 r17586 82 82 } 83 83 84 public Task Update JobState(Guid taskId, TaskState taskState, string exception) {84 public Task UpdateTaskState(Guid taskId, TaskState taskState, string exception) { 85 85 return CallHiveService(s => s.UpdateTaskState(taskId, taskState, ConfigManager.Instance.GetClientInfo().Id, null, exception)); 86 86 }
Note: See TracChangeset
for help on using the changeset viewer.