mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java

@@ -242,8 +242,6 @@ public class ProjectConsumer {
         String projectId = jsonNode.path("projectId").asText();
         String type = jsonNode.path("type").asText();
         projectService.stopProject(projectId, type);
-
-
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskManager.java

@@ -241,6 +241,8 @@ public class TaskManager {
                             log.info("TaskService--state 项目" + projectId + "的任务" + task2Id + "打分结束，结果为：" + scoreResult);
                             String replace = StringUtil.replace(scoreResult, "'", "\"");
                             score = JsonUtil.jsonToBean(replace, ScoreTO.class);
+                            FileUtil.rm(runResultLinux);
+                            log.info("TaskService--state 已删除运行结果文件 Ego.csv：" + runResultLinux);
                         } catch (IOException e) {
                             throw new RuntimeException("------- TaskService--state 项目" + projectId + "的任务" + task2Id + " 打分出错，命令为：" + scoreCommand + " 修改状态为：" + DictConstants.TASK_ABORTED + "\n" + e.getMessage());
                         }

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

@@ -330,6 +330,8 @@ public class ProjectService {
                 // 本地执行 docker load 算法文件成镜像（可改成用 docker-java 操作仓库）
                 LinuxUtil.execute("docker import " + algorithmTarLinuxTempPath + " " + dockerImage);
                 algorithmMapper.updateDockerImportAndDockerImageById("1", dockerImage, algorithmId);
+                FileUtil.rm(algorithmTarLinuxTempPath);
+                log.info("ProjectService--handleAlgorithm 已删除算法临时文件：" + algorithmTarLinuxTempPath);
             } else {
                 throw new RuntimeException("算法 " + algorithmId + " 的 mysql 数据有误！");
             }
@@ -362,7 +364,15 @@ public class ProjectService {
         String replace5 = replace4.replace("completions-number", completions + "");
         String replace6 = replace5.replace("parallelism-number", parallelism + "");
         String replace7 = replace6.replace("apiVers1on", "apiVersion");
-        String finalYaml = replace7.replace("1atch/v1", "batch/v1");
+        String replace8 = replace7.replace("1atch/v1", "batch/v1");
+        // 根据 kubernetes 的 node 分配 job
+        //1 获取 node 列表
+        //2 获取 node 的 pod 列表
+        //3 获取 pod 数量最少的 node
+        //4 将 job 指定 node 执行
+
+
+        String finalYaml = replace8;
         log.info("ProjectConsumer--parseManualProject 开始执行 yaml 文件" + finalYaml);
         FileUtil.writeStringToLocalFile(finalYaml, jobTemplateYamlPathTarget);
         //  启动