commit

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

@@ -534,7 +534,7 @@ public class ProjectApplicationService {
             String currentNodeName = "";
             NodeEntity currentNodeEntity = null;
             int currentCount = Integer.MAX_VALUE;
-            log.info("各节点已经预定的任务个数为：" + nodeListToCount);
+            log.info("各节点已经预定的任务个数为：{}", nodeListToCount);
             for (NodeEntity nodeEntity : nodeListToCount) {
                 int tempCount = nodeEntity.getCount();
                 String tempNodeName = nodeEntity.getNodeName();
@@ -557,7 +557,7 @@ public class ProjectApplicationService {
                 remainderNodeMap.put(currentNodeName, cpuOrder);
             }
             // 只有准备启动（即 currentCount == 0）的时候才指定 cpu 编号
-            log.info("创建任务 " + taskId + " 的 yaml：是否使用 gpu （0是1否）" + isChoiceGpu + "，当前节点已创建 yaml 个数为：" + currentCount + "，当前节点名称为：" + currentNodeName + "，当前 cpu 编号为：" + cpuOrder + "，镜像名：" + algorithmDockerImage);
+            log.info("创建任务 {} 的 yaml：是否使用 gpu （0是1否）{}，当前节点已创建 yaml 个数为：{}，当前节点名称为：{}，当前 cpu 编号为：{}，镜像名：{}", taskId, isChoiceGpu, currentCount, currentNodeName, cpuOrder, algorithmDockerImage);
             String yamlRedisKey = projectDomainService.createTempYaml(projectId, vehicleConfigId, modelType, algorithmDockerImage, currentNodeName, partition, offset, isChoiceGpu, cpuOrder);
             if (currentCount == 0) {
                 yamlToRunRedisKeyList.add(yamlRedisKey);
@@ -584,9 +584,9 @@ public class ProjectApplicationService {
         }
         //1 获取剩余并行度和即将使用的各node的并行度
         Map<String, Integer> remainderNodeMap = projectDomainService.getRemainderNodeMap(isChoiceGpu);
-        log.info("剩余并行度为：" + remainderNodeMap);
+        log.info("剩余并行度为：{}", remainderNodeMap);
         Map<String, Integer> nodeMapToUse = projectDomainService.getNodeMapToUse(isChoiceGpu, expandParallelism);
-        log.info("即将使用的并行度为：" + nodeMapToUse);
+        log.info("即将使用的并行度为：{}", nodeMapToUse);
         //2 将指定 node 的并行度减少
         nodeMapToUse.keySet().forEach(nodeName -> projectDomainService.decrementParallelism(isChoiceGpu, nodeName, nodeMapToUse.get(nodeName)));
         //3 获取还未运行的任务 ("project:" + projectId + ":node:" + nodeName + ":yaml")

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

@@ -363,7 +363,7 @@ public class ProjectDomainService {
         Map<String, Integer> resultNodeMap = new HashMap<>();    // 用于执行的节点映射（节点名，并行度）
         if (DictConstants.USE_GPU.equals(isChoiceGpu)) {
             List<NodeEntity> initialNodeList = kubernetesConfiguration.getGpuNodeList();
-            log.info("预设并行度的GPU节点列表为：" + initialNodeList);
+            log.info("预设并行度的GPU节点列表为：{}", initialNodeList);
             for (NodeEntity kubernetesNodeSource : initialNodeList) {
                 NodeEntity kubernetesNodeCopy = kubernetesNodeSource.clone();
                 String nodeName = kubernetesNodeCopy.getHostname();
@@ -379,10 +379,10 @@ public class ProjectDomainService {
                 }
                 resultNodeMap.put(nodeName, restParallelism);
             }
-            log.info("剩余并行度的GPU节点列表为：" + resultNodeMap);
+            log.info("剩余并行度的GPU节点列表为：{}", resultNodeMap);
         } else if (DictConstants.USE_CPU.equals(isChoiceGpu)) {
             List<NodeEntity> initialNodeList = kubernetesConfiguration.getCpuNodeList();
-            log.info("预设并行度的CPU节点列表为：" + initialNodeList);
+            log.info("预设并行度的CPU节点列表为：{}", initialNodeList);
             for (NodeEntity kubernetesNodeSource : initialNodeList) {
                 NodeEntity kubernetesNodeCopy = kubernetesNodeSource.clone();
                 String nodeName = kubernetesNodeCopy.getHostname();
@@ -398,7 +398,7 @@ public class ProjectDomainService {
                 }
                 resultNodeMap.put(nodeName, restParallelism);
             }
-            log.info("剩余并行度的CPU节点列表为：" + resultNodeMap);
+            log.info("剩余并行度的CPU节点列表为：{}", resultNodeMap);
         }
         return resultNodeMap;
     }