Changeset 17576

Timestamp:

05/29/20 13:33:05 (4 years ago)

Author:

jkarder

Message:

#3063: minor cleanup

• renamed UpdateJobState to UpdateTaskState
• updated HiveSlaveInstaller.nsi

Location:

trunk

Files:

• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs (modified) (1 diff)
• Installers/HiveSlaveInstaller.nsi (modified) (2 diffs)

trunk/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -251 +251 @@
         TaskData taskData = wcfService.GetTaskData(taskId);
         if (taskData == null) throw new TaskDataNotFoundException(taskId);
-        task = wcfService.UpdateJobState(taskId, TaskState.Calculating, null);
+        task = wcfService.UpdateTaskState(taskId, TaskState.Calculating, null);
         if (task == null) throw new TaskNotFoundException(taskId);
         taskManager.StartTaskAsync(task, taskData);
@@ -268 +268 @@
       }
       catch (OutOfCoresException) {
-        wcfService.UpdateJobState(taskId, TaskState.Waiting, "No more cores available");
+        wcfService.UpdateTaskState(taskId, TaskState.Waiting, "No more cores available");
         throw;
       }
       catch (OutOfMemoryException) {
-        wcfService.UpdateJobState(taskId, TaskState.Waiting, "No more memory available");
+        wcfService.UpdateTaskState(taskId, TaskState.Waiting, "No more memory available");
         throw;
       }
       catch (Exception e) {
         SlaveStatusInfo.DecrementUsedCores(usedCores);
-        wcfService.UpdateJobState(taskId, TaskState.Failed, e.ToString());
+        wcfService.UpdateTaskState(taskId, TaskState.Failed, e.ToString());
         throw;
       }
@@ -391 +391 @@
           wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Failed, exception.ToString());
         } else {
-          wcfService.UpdateJobState(task.Id, TaskState.Failed, exception.ToString());
+          wcfService.UpdateTaskState(task.Id, TaskState.Failed, exception.ToString());
         }
         SlaveClientCom.Instance.LogMessage(exception.Message);
@@ -408 +408 @@
       var slaveTask = e.Value;
       var task = wcfService.GetTask(slaveTask.TaskId);
-      wcfService.UpdateJobState(task.Id, TaskState.Aborted, null);
+      wcfService.UpdateTaskState(task.Id, TaskState.Aborted, null);
       SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
     }

trunk/HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs

@@ -82 +82 @@
     }
 
-    public Task UpdateJobState(Guid taskId, TaskState taskState, string exception) {
+    public Task UpdateTaskState(Guid taskId, TaskState taskState, string exception) {
       return CallHiveService(s => s.UpdateTaskState(taskId, taskState, ConfigManager.Instance.GetClientInfo().Id, null, exception));
     }

trunk/Installers/HiveSlaveInstaller.nsi

@@ -46 +46 @@
   SetOutPath $INSTDIR
 
+  File "${SLAVEBUILDPATH}\Google.Protobuf.dll"
+  File "${SLAVEBUILDPATH}\HEAL.Attic.dll"
+  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe"
-  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config"
   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll"
@@ -82 +84 @@
 
   nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --uninstall'
-    
-  Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe
-  Delete $INSTDIR\HeuristicLab.Clients.Common-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config
-  Delete $INSTDIR\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Clients.Hive-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Collections-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Common.Resources-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Common-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Core-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Data-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Hive-3.3.dll
-  Delete $INSTDIR\HeuristicLab.MainForm-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Optimization-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Parameters-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Persistence-3.3.dll
-  Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll
-  Delete $INSTDIR\uninstall.exe
 
-  RMDir "$INSTDIR"
+  RMDir /r "$INSTDIR"
 SectionEnd