Changeset 17576


Ignore:
Timestamp:
05/29/20 13:33:05 (2 years ago)
Author:
jkarder
Message:

#3063: minor cleanup

  • renamed UpdateJobState to UpdateTaskState
  • updated HiveSlaveInstaller.nsi
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

    r17180 r17576  
    251251        TaskData taskData = wcfService.GetTaskData(taskId);
    252252        if (taskData == null) throw new TaskDataNotFoundException(taskId);
    253         task = wcfService.UpdateJobState(taskId, TaskState.Calculating, null);
     253        task = wcfService.UpdateTaskState(taskId, TaskState.Calculating, null);
    254254        if (task == null) throw new TaskNotFoundException(taskId);
    255255        taskManager.StartTaskAsync(task, taskData);
     
    268268      }
    269269      catch (OutOfCoresException) {
    270         wcfService.UpdateJobState(taskId, TaskState.Waiting, "No more cores available");
     270        wcfService.UpdateTaskState(taskId, TaskState.Waiting, "No more cores available");
    271271        throw;
    272272      }
    273273      catch (OutOfMemoryException) {
    274         wcfService.UpdateJobState(taskId, TaskState.Waiting, "No more memory available");
     274        wcfService.UpdateTaskState(taskId, TaskState.Waiting, "No more memory available");
    275275        throw;
    276276      }
    277277      catch (Exception e) {
    278278        SlaveStatusInfo.DecrementUsedCores(usedCores);
    279         wcfService.UpdateJobState(taskId, TaskState.Failed, e.ToString());
     279        wcfService.UpdateTaskState(taskId, TaskState.Failed, e.ToString());
    280280        throw;
    281281      }
     
    391391          wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Failed, exception.ToString());
    392392        } else {
    393           wcfService.UpdateJobState(task.Id, TaskState.Failed, exception.ToString());
     393          wcfService.UpdateTaskState(task.Id, TaskState.Failed, exception.ToString());
    394394        }
    395395        SlaveClientCom.Instance.LogMessage(exception.Message);
     
    408408      var slaveTask = e.Value;
    409409      var task = wcfService.GetTask(slaveTask.TaskId);
    410       wcfService.UpdateJobState(task.Id, TaskState.Aborted, null);
     410      wcfService.UpdateTaskState(task.Id, TaskState.Aborted, null);
    411411      SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
    412412    }
  • trunk/HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs

    r17180 r17576  
    8282    }
    8383
    84     public Task UpdateJobState(Guid taskId, TaskState taskState, string exception) {
     84    public Task UpdateTaskState(Guid taskId, TaskState taskState, string exception) {
    8585      return CallHiveService(s => s.UpdateTaskState(taskId, taskState, ConfigManager.Instance.GetClientInfo().Id, null, exception));
    8686    }
  • trunk/Installers/HiveSlaveInstaller.nsi

    r17182 r17576  
    4646  SetOutPath $INSTDIR
    4747
     48  File "${SLAVEBUILDPATH}\Google.Protobuf.dll"
     49  File "${SLAVEBUILDPATH}\HEAL.Attic.dll"
     50  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
    4851  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe"
    49   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
    5052  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config"
    5153  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll"
     
    8284
    8385  nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --uninstall'
    84    
    85   Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe
    86   Delete $INSTDIR\HeuristicLab.Clients.Common-3.3.dll
    87   Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config
    88   Delete $INSTDIR\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll
    89   Delete $INSTDIR\HeuristicLab.Clients.Hive-3.3.dll
    90   Delete $INSTDIR\HeuristicLab.Collections-3.3.dll
    91   Delete $INSTDIR\HeuristicLab.Common.Resources-3.3.dll
    92   Delete $INSTDIR\HeuristicLab.Common-3.3.dll
    93   Delete $INSTDIR\HeuristicLab.Core-3.3.dll
    94   Delete $INSTDIR\HeuristicLab.Data-3.3.dll
    95   Delete $INSTDIR\HeuristicLab.Hive-3.3.dll
    96   Delete $INSTDIR\HeuristicLab.MainForm-3.3.dll
    97   Delete $INSTDIR\HeuristicLab.Optimization-3.3.dll
    98   Delete $INSTDIR\HeuristicLab.Parameters-3.3.dll
    99   Delete $INSTDIR\HeuristicLab.Persistence-3.3.dll
    100   Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll
    101   Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll
    102   Delete $INSTDIR\uninstall.exe
    10386
    104   RMDir "$INSTDIR"
     87  RMDir /r "$INSTDIR"
    10588SectionEnd
    10689
Note: See TracChangeset for help on using the changeset viewer.