标准化测试

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

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

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

@@ -165,10 +165,7 @@ public class TaskService {
         } catch (io.kubernetes.client.openapi.ApiException apiException) {
             log.info("POD：" + podName + "已删除。");
         } catch (Exception e) {
-            log.error("项目报错。", e);
-//            final ProjectEntity project = projectDomainService.getProjectByProjectId(projectId);
-//            projectService.stopProject(projectId, project.getProjectType(), e.getMessage());
-            throw new RuntimeException(e);
+            log.error("项目 {} 已结束。", projectId);
         } finally {
             customRedisClient.unlock(lock1);
         }

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

@@ -590,7 +590,8 @@ public class ProjectDomainService {
     @Synchronized
     public boolean complete(PrefixEntity redisPrefix, String projectId) {
         boolean result = false;
-        ProjectMessageModel projectMessageModel = JsonUtil.jsonToBean(customRedisClient.get(redisPrefix.getProjectRunningKey()), ProjectMessageModel.class);
+        String projectMessageModelJson = customRedisClient.get(redisPrefix.getProjectRunningKey());
+        ProjectMessageModel projectMessageModel = JsonUtil.jsonToBean(projectMessageModelJson, ProjectMessageModel.class);
         int taskTotal = projectMessageModel.getTaskTotal();
         int taskCompleted = projectMessageModel.getTaskCompleted();
         log.info("项目 " + projectId + " 完成进度为：" + (taskCompleted + 1) + "/" + taskTotal);
@@ -799,10 +800,10 @@ public class ProjectDomainService {
         }
     }
 
-    public void removeWaitQueue(String projectId) {
+    public void removeWaitQueueOfExecute(String projectId) {
         List<ProjectWaitQueueEntity> waitQueue = getWaitQueue();
         for (ProjectWaitQueueEntity projectWaitQueueEntity : waitQueue) {
-            if (projectWaitQueueEntity.getProjectMessageModel().getProjectId().equals(projectId)) {
+            if (projectWaitQueueEntity.getProjectMessageModel().getProjectId().equals(projectId) || projectWaitQueueEntity.getWaitingType().equals(DictConstants.PROJECT_WAIT_TYPE_EXECUTE)) {
                 waitQueue.remove(projectWaitQueueEntity);
                 break;
             }

simulation-resource-scheduler/src/main/resources/logback-spring.xml

@@ -7,9 +7,6 @@
     <springProfile name="private">
         <property name="LOG_HOME" value="./log"/>
     </springProfile>
-    <springProfile name="private2">
-        <property name="LOG_HOME" value="./log"/>
-    </springProfile>
 
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
@@ -18,7 +15,7 @@
             <level>debug</level>
         </filter>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %cyan(%logger{5}).%M\(%F:%L\) %msg %n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{5}.%M\(%F:%L\) %msg %n</pattern>
             <charset>utf-8</charset>
         </encoder>
     </appender>
@@ -35,7 +32,7 @@
         </rollingPolicy>
         <append>true</append>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %cyan(%logger{5}).%M\(%F:%L\) %msg %n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{5}.%M\(%F:%L\) %msg %n</pattern>
             <charset>utf-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印DEBUG日志 -->
@@ -57,7 +54,7 @@
         </rollingPolicy>
         <append>true</append>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %cyan(%logger{5}).%M\(%F:%L\) %msg %n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{5}.%M\(%F:%L\) %msg %n</pattern>
             <charset>utf-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印INFO日志 -->
@@ -79,7 +76,7 @@
         </rollingPolicy>
         <append>true</append>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %cyan(%logger{5}).%M\(%F:%L\) %msg %n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{5}.%M\(%F:%L\) %msg %n</pattern>
             <charset>utf-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印ERROR日志 -->
@@ -101,7 +98,7 @@
         </rollingPolicy>
         <append>true</append>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %cyan(%logger{5}).%M\(%F:%L\) %msg %n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{5}.%M\(%F:%L\) %msg %n</pattern>
             <charset>utf-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印WARN日志 -->