夜得朦胧 11 maanden geleden
bovenliggende
commit
3641ad1d91

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

@@ -621,7 +621,7 @@ public class ProjectApplicationService {
             }
             MultiSimulationSceneKafkaParam multiSimulationSceneKafkaParam = multiProjectWaitQueue.getKafkaParamList().get(i);
             MultiCreateYamlRet multiTempYaml = projectDomainService.createMultiTempYaml(projectId, multiSimulationSceneKafkaParam, messageEntity
-                ,multiProjectWaitQueue.getConnectorPath(),multiProjectWaitQueue.getControllerPath()
+                ,multiProjectWaitQueue.getConnectorPath(),multiProjectWaitQueue.getControllerPath(),multiProjectWaitQueue.getSoftwarePath()
                 , modelName, partition, offset, isChoiceGpu);
             multiTempYaml.setTaskId(messageEntity.getInfo().getTask_id());
             multiTempYaml.setNodeName(modelName);

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

@@ -229,7 +229,7 @@ public class ProjectDomainService {
 
     @SneakyThrows
     public MultiCreateYamlRet createMultiTempYaml(String projectId, MultiSimulationSceneKafkaParam multiSimulationSceneKafkaParam, MultiTaskMessageEntity messageEntity,
-                                                  String connectorPath, String controllerPath,
+                                                  String connectorPath, String controllerPath,String softPath,
                                                   String nodeName, int kafkaPartition, long kafkaOffset, String isChoiceGpu) {
         String podName = getMultiRandomPodName(projectId);   // 生成 podName
         String podYaml = getMultiPodYamlName(nodeName, podName);     // 模板文件名称
@@ -242,7 +242,8 @@ public class ProjectDomainService {
         podString = podString.replace("namespace-name", kubernetesConfiguration.getMultiNamespace());
         podString = podString.replace("node-name", nodeName);
         podString = podString.replace("vtd-container", "vtd-multi-" + messageEntity.getInfo().getScene_id());
-        podString = podString.replace("vtd-image", kubernetesConfiguration.getMultiImageVtdGpu());
+//        podString = podString.replace("vtd-image", kubernetesConfiguration.getMultiImageVtdGpu());
+        podString = podString.replace("vtd-image", softPath);
         podString = podString.replace("simulation-cloud-ip", simulationCloudIp);
         podString = podString.replace("kafka-ip", kafkaIp);
         podString = podString.replace("minio-ip", minioConfiguration.getEndpointWithoutHttp());