commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/TaskApplicationService.java

@@ -218,7 +218,7 @@ public class TaskApplicationService {
                 customRedisClient.unlock(lock2);
             }
         } catch (io.kubernetes.client.openapi.ApiException apiException) {
-            log.info("POD：" + podName + "已删除。");
+            log.error("POD：" + podName + "已删除。", apiException);
         } catch (Exception e) {
             log.error("项目 {} 已结束。", projectId, e);
         } finally {

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

@@ -129,30 +129,32 @@ public class ProjectDomainService {
             String replace4 = replace3.replace("kafka-partition", "\"" + kafkaPartition + "\"");
             String replace5 = replace4.replace("kafka-offset", "\"" + kafkaOffset + "\"");
             String replace6 = replace5.replace("minio-ip", minioConfiguration.getEndpointWithoutHttp());
-            String replace7 = replace6.replace("minio-access-key", minioConfiguration.getAccessKey());
-            String replace8 = replace7.replace("minio-secret-key", minioConfiguration.getSecretKey());
+            String replace7 = replace6.replace("minio-bucket", minioConfiguration.getBucketName());
+            String replace8 = replace7.replace("minio-access-key", minioConfiguration.getAccessKey());
+            String replace9 = replace8.replace("minio-secret-key", minioConfiguration.getSecretKey());
 
-            String replace9 = replace8.replace("algorithm-container", "algorithm-" + projectId);
-            String replace10 = replace9.replaceAll("algorithm-image", algorithmDockerImage);
+            String replace10 = replace9.replace("algorithm-container", "algorithm-" + projectId);
+            String replace11 = replace10.replaceAll("algorithm-image", algorithmDockerImage);
 
-            String replace11 = replace10.replace("pod-name", podName); // pod 名称包括 projectId 和 随机字符串
-            String replace12 = replace11.replace("namespace-name", kubernetesConfiguration.getNamespace()); // pod 名称包括 projectId 和 随机字符串
-            String replace13 = replace12.replace("node-name", nodeName);     // 指定 pod 运行节点
+            String replace12 = replace11.replace("pod-name", podName); // pod 名称包括 projectId 和 随机字符串
+            String replace13 = replace12.replace("namespace-name", kubernetesConfiguration.getNamespace()); // pod 名称包括 projectId 和 随机字符串
+            String replace14 = replace13.replace("node-name", nodeName);     // 指定 pod 运行节点
 
-            String replace14;
+            String replace15;
             if (cpuOrder != null) {
-                replace14 = replace13.replace("cpu-order", "\"" + cpuOrder + "\"");     // 指定 cpu 编号
+                replace15 = replace14.replace("cpu-order", "\"" + cpuOrder + "\"");     // 指定 cpu 编号
                 stringRedisTemplate.opsForValue().set("project:" + projectId + ":pod:" + podName + ":cpu", String.valueOf(cpuOrder));    //  pod 运行使用的 cpu编号
             } else {
-                replace14 = replace13;
+                replace15 = replace14;
             }
 
+
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {
-                String replace15 = replace14.replace("vtd-image", kubernetesConfiguration.getImageVtdGpu());
-                finalYaml = replace15.replace("vtd-command", kubernetesConfiguration.getCommandVtdGpu());
+                String replace16 = replace15.replace("vtd-image", kubernetesConfiguration.getImageVtdGpu());
+                finalYaml = replace16.replace("vtd-command", kubernetesConfiguration.getCommandVtdGpu());
             } else if (DictConstants.NOT_USE_GPU.equals(isChoiceGpu)) {
-                String replace15 = replace14.replace("vtd-image", kubernetesConfiguration.getImageVtdNogpu());
-                finalYaml = replace15.replace("vtd-command", kubernetesConfiguration.getCommandVtdNogpu());
+                String replace16 = replace15.replace("vtd-image", kubernetesConfiguration.getImageVtdNogpu());
+                finalYaml = replace16.replace("vtd-command", kubernetesConfiguration.getCommandVtdNogpu());
             } else {
                 throw new RuntimeException("是否使用 gpu：" + isChoiceGpu);
             }