标准化测试

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

@@ -540,6 +540,9 @@ public class ProjectService {
             projectDomainService.createPodBegin(projectId, redisKey);
         }
         log.info("项目 " + projectId + " 已经启动 " + yamlToRunRedisKeyList);
+        // 项目启动之后删除等待队列中的该项目
+        projectDomainService.removeWaitQueue(projectId);
+
     }
 
 

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

@@ -57,7 +57,6 @@ public class TaskService {
 
     // -------------------------------- Comment --------------------------------
 
-    @Async("pool1")
     public void state(String taskId, String state, String podName) {
         TaskEntity taskEntity = taskMapper.selectById(taskId);
         if (taskEntity == null) {
@@ -163,6 +162,8 @@ public class TaskService {
             } finally {
                 customRedisClient.unlock(lock2);
             }
+        } catch (io.kubernetes.client.openapi.ApiException apiException) {
+            log.info("POD：" + podName + "已删除。");
         } catch (Exception e) {
             log.error("项目报错。", e);
 //            final ProjectEntity project = projectDomainService.getProjectByProjectId(projectId);

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

@@ -798,4 +798,15 @@ public class ProjectDomainService {
             throw new RuntimeException(e);
         }
     }
+
+    public void removeWaitQueue(String projectId) {
+        List<ProjectWaitQueueEntity> waitQueue = getWaitQueue();
+        for (ProjectWaitQueueEntity projectWaitQueueEntity : waitQueue) {
+            if (projectWaitQueueEntity.getProjectMessageModel().getProjectId().equals(projectId)) {
+                waitQueue.remove(projectWaitQueueEntity);
+                break;
+            }
+        }
+        setWaitQueue(waitQueue);
+    }
 }

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

@@ -320,7 +320,7 @@ public class TaskDomainService {
     }
 
     public void taskTick(String taskId) {
-        log.info("收到任务 " + taskId + " 的心跳。");
+        log.debug("收到任务 " + taskId + " 的心跳。");
         TaskEntity taskEntity = taskMapper.selectById(taskId);
         if (taskEntity == null) {
             return;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/scheduler/ProjectScheduler.java

@@ -26,7 +26,7 @@ public class ProjectScheduler {
     /**
      * 调度项目启动
      */
-    @Scheduled(fixedDelay = 10000)
+    @Scheduled(fixedDelay = 60000)
     public void dispatchProject() {
         List<ProjectWaitQueueEntity> projectWaitQueue = projectDomainService.getWaitQueue();
         if (CollectionUtil.isNotEmpty(projectWaitQueue)) {