Changeset 11121 for stable/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs
- Timestamp:
- 07/07/14 17:00:14 (10 years ago)
- Location:
- stable
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11082,11113,11117
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs
r9456 r11121 204 204 TS.Task.Factory.StartNew(HandleCalculateTask, jobId) 205 205 .ContinueWith((t) => { 206 SlaveStatusInfo.Increment ExceptionOccured();206 SlaveStatusInfo.IncrementTasksFailed(); 207 207 SlaveClientCom.Instance.LogMessage(t.Exception.ToString()); 208 208 }, TaskContinuationOptions.OnlyOnFaulted); … … 212 212 TS.Task.Factory.StartNew(HandleStopTask, jobId) 213 213 .ContinueWith((t) => { 214 SlaveStatusInfo.Increment ExceptionOccured();214 SlaveStatusInfo.IncrementTasksFailed(); 215 215 SlaveClientCom.Instance.LogMessage(t.Exception.ToString()); 216 216 }, TaskContinuationOptions.OnlyOnFaulted); … … 220 220 TS.Task.Factory.StartNew(HandlePauseTask, jobId) 221 221 .ContinueWith((t) => { 222 SlaveStatusInfo.Increment ExceptionOccured();222 SlaveStatusInfo.IncrementTasksFailed(); 223 223 SlaveClientCom.Instance.LogMessage(t.Exception.ToString()); 224 224 }, TaskContinuationOptions.OnlyOnFaulted); … … 228 228 TS.Task.Factory.StartNew(HandleAbortTask, jobId) 229 229 .ContinueWith((t) => { 230 SlaveStatusInfo.Increment ExceptionOccured();230 SlaveStatusInfo.IncrementTasksFailed(); 231 231 SlaveClientCom.Instance.LogMessage(t.Exception.ToString()); 232 232 }, TaskContinuationOptions.OnlyOnFaulted); … … 328 328 this.taskManager.TaskStopped += new EventHandler<EventArgs<SlaveTask, TaskData>>(taskManager_TaskStopped); 329 329 this.taskManager.TaskFailed += new EventHandler<EventArgs<Tuple<SlaveTask, TaskData, Exception>>>(taskManager_TaskFailed); 330 this.taskManager.ExceptionOccured += new EventHandler<EventArgs<SlaveTask, Exception>>(taskManager_ExceptionOccured);331 330 this.taskManager.TaskAborted += new EventHandler<EventArgs<SlaveTask>>(taskManager_TaskAborted); 332 331 } … … 391 390 } 392 391 catch (TaskNotFoundException ex) { 393 SlaveStatusInfo.Increment ExceptionOccured();392 SlaveStatusInfo.IncrementTasksFailed(); 394 393 SlaveClientCom.Instance.LogMessage(ex.ToString()); 395 394 } 396 395 catch (Exception ex) { 397 SlaveStatusInfo.Increment ExceptionOccured();396 SlaveStatusInfo.IncrementTasksFailed(); 398 397 SlaveClientCom.Instance.LogMessage(ex.ToString()); 399 398 } 400 }401 402 private void taskManager_ExceptionOccured(object sender, EventArgs<SlaveTask, Exception> e) {403 SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);404 SlaveStatusInfo.IncrementExceptionOccured();405 heartbeatManager.AwakeHeartBeatThread();406 SlaveClientCom.Instance.LogMessage(string.Format("Exception occured for task {0}: {1}", e.Value.TaskId, e.Value2.ToString()));407 wcfService.UpdateJobState(e.Value.TaskId, TaskState.Waiting, e.Value2.ToString());408 399 } 409 400
Note: See TracChangeset
for help on using the changeset viewer.