夜得朦胧 11 ヶ月 前
コミット
cb088326e8

+ 2 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/ProjectApplicationService.java

@@ -684,6 +684,7 @@ public class ProjectApplicationService {
         SimulationMageGroupPO groupPO = mageGroupMapper.selectSimulationMageGroupById(projectStartMessageEntity.getSimulationMageGroupId());
         String connectorPath = groupPO.getConnectorPath();
         String controllerPath = groupPO.getControllerPath();
+        String softwarePath = groupPO.getSoftwarePath();
         ArrayList<String> yamlToRunRedisKeyList = new ArrayList<>();
         for (String taskJsonPath : taskJsonList) {
             String taskId = FileUtil.getFilenameWithoutSuffix(taskJsonPath);
@@ -728,7 +729,7 @@ public class ProjectApplicationService {
             }
             // 只有准备启动(即 currentCount == 0)的时候才指定 cpu 编号
             log.info("创建任务 {} 的 yaml:是否使用 gpu (0是1否){},当前节点已创建 yaml 个数为:{},当前节点名称为:{},当前 cpu 编号为:{},镜像名:{}", taskId, isChoiceGpu, currentCount, currentNodeName, cpuOrder, algorithmDockerImage);
-            String yamlRedisKey = projectDomainService.createTempYaml(projectId, vehicleConfigId, modelType, algorithmDockerImage, currentNodeName, partition, offset, isChoiceGpu, cpuOrder, connectorPath, controllerPath);
+            String yamlRedisKey = projectDomainService.createTempYaml(projectId, vehicleConfigId, modelType, algorithmDockerImage, currentNodeName, partition, offset, isChoiceGpu, cpuOrder, connectorPath, controllerPath, softwarePath);
             if (currentCount == 0) {
                 yamlToRunRedisKeyList.add(yamlRedisKey);
             }

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java

@@ -114,7 +114,7 @@ public class ProjectDomainService {
      * 创建一个临时 yaml,node 在最后用 # 号隔开
      */
     @SneakyThrows
-    public String createTempYaml(String projectId, String vehicleConfigId, String modelType, String algorithmDockerImage, String nodeName, int kafkaPartition, long kafkaOffset, String isChoiceGpu, Integer cpuOrder, String connectorPath, String controllerPath) {
+    public String createTempYaml(String projectId, String vehicleConfigId, String modelType, String algorithmDockerImage, String nodeName, int kafkaPartition, long kafkaOffset, String isChoiceGpu, Integer cpuOrder, String connectorPath, String controllerPath, String softwarePath) {
         String podName = getRandomPodName(projectId);   // 生成 podName
         String podYaml = getPodYamlName(nodeName, podName);     // 模板文件名称
         String yamlPath = podYamlDirectory + podYaml;