mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/TaskController.java

@@ -31,21 +31,6 @@ public class TaskController {
         taskService.taskState(taskId, state, podName);
     }
 
-//    /**
-//     * 修改任务状态
-//     */
-//    @GetMapping("/state")
-//    public void taskState(
-//            @RequestParam("taskId") String taskId,
-//            @RequestParam("state") String state,
-//            @RequestParam("podName") String podName,
-//            @RequestParam("partition") String partition,
-//            @RequestParam("offset") String offset
-//
-//    ) {
-//        taskService.taskState(taskId, state, podName);
-//    }
-
     /**
      * Pod 的心跳接口
      */

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

@@ -47,7 +47,7 @@ public class TaskManager {
     @Value("${minio.bucket-name}")
     private String bucketName;
     @Value("${scheduler.linux-path.score-py}")
-    private  String pyPath;
+    private String pyPath;
     @Value("${scheduler.linux-path.temp}")
     private String linuxTempPath;
     @Value("${simulation-cloud.client-id}")
@@ -57,7 +57,7 @@ public class TaskManager {
     @Value("${simulation-cloud.token-uri}")
     private String tokenUri;
     @Value("${simulation-cloud.evaluation-level-uri}")
-    private  String evaluationLevelUri;
+    private String evaluationLevelUri;
     @Value("${scheduler.minio-path.project-result}")
     private String resultPathMinio;
     @Value("${spring.kafka.hostname}")
@@ -156,6 +156,9 @@ public class TaskManager {
                 }
                 // -------------------------------- 判断项目是否结束 --------------------------------
                 result = taskLock.complete(redisPrefix, projectId, nodeName, podName);
+                if (!result) {
+                    projectUtil.createNextPod2(projectId, nodeName, podName);
+                }
             } catch (Exception exception) {
                 log.info("TaskManager--isCompleted 报错。", exception);
             }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/resource/TaskLock.java

@@ -43,7 +43,7 @@ public class TaskLock {
             } else {    // 项目没有完成
                 projectMessageDTO.setTaskCompleted(taskCompleted + 1);  // 增加已完成任务数
                 stringRedisTemplate.opsForValue().set(redisPrefix.getProjectRunningKey(), JsonUtil.beanToJson(projectMessageDTO));
-                projectUtil.createNextPod2(projectId, nodeName, podName);
+
             }
         } catch (Exception e) {
             throw new RuntimeException(e);

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

@@ -50,7 +50,6 @@ public class TaskService {
         String userId = taskPO.getCreateUserId();   // 用户 id
         PrefixTO redisPrefix = projectUtil.getRedisPrefixByUserIdAndProjectIdAndTaskId(userId, projectId, taskId);  // 项目前缀
         //1 判断项目是否已完成
-
         boolean projectCompleted = taskManager.isProjectCompleted(redisPrefix, projectId, projectType, maxSimulationTime, taskId, state, podName);
         if (!projectCompleted) {
             return;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/ProjectUtil.java

@@ -59,8 +59,6 @@ public class ProjectUtil {
     private ApiClient apiClient;
 
 
-
-
     @SneakyThrows
     public void deleteYamlByProjectId(String projectId) {
         List<String> absolutePathList = FileUtil.listAbsolutePath(podYamlDirectory);
@@ -178,12 +176,12 @@ public class ProjectUtil {
         for (String absolutePath : list) {
             if (absolutePath.contains(nodeName) && absolutePath.contains(projectId)) {
                 createPod2(absolutePath);
-                log.info("ProjectUtil--createNextPod 创建项目 " + projectId + " 的下一个 pod。");
+                log.info("createNextPod2() 创建项目 " + projectId + " 在节点" + nodeName + "的下一个 pod。");
                 return;
             }
         }
         // 如果当前节点没有下一个yaml，则返回一个并行度。
-        log.info("ProjectUtil.createNextPod2() 节点 " + nodeName + " 已经执行完被分配的项目 " + projectId + " 的所有 pod。");
+        log.info("createNextPod2() 节点 " + nodeName + " 已经执行完被分配的项目 " + projectId + " 的所有 pod。");
         addOneParallelismToNode(nodeName);
     }