docker 配置 vtd 镜像

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

@@ -421,7 +421,7 @@ public class TaskManager {
         String projectId = taskPO.getPId();
         String userId = taskPO.getCreateUserId();
         // 刷新 redis 心跳时间
-        PrefixTO redisPrefix = projectUtil.getRedisPrefixByUserIdAndProjectIdAndTaksId(userId, projectId, taskId);
+        PrefixTO redisPrefix = projectUtil.getRedisPrefixByUserIdAndProjectIdAndTaskId(userId, projectId, taskId);
         if (RedisUtil.getStringByKey(stringRedisTemplate, redisPrefix.getProjectRunningKey()) != null) {
             stringRedisTemplate.opsForValue().set(redisPrefix.getTaskTickKey(), TimeUtil.getNowString());
         }

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

@@ -199,7 +199,7 @@ public class ProjectScheduler {
             String userId = task.getCreateUserId();
             String projectId = task.getPId();
             String taskId = task.getId();
-            PrefixTO redisPrefix = projectUtil.getRedisPrefixByUserIdAndProjectIdAndTaksId(userId, projectId, taskId);
+            PrefixTO redisPrefix = projectUtil.getRedisPrefixByUserIdAndProjectIdAndTaskId(userId, projectId, taskId);
             // 获取心跳时间
             String tickTime = stringRedisTemplate.opsForValue().get(redisPrefix.getTaskTickKey());
             if (StringUtil.isEmpty(tickTime)) {

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

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

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

@@ -230,7 +230,7 @@ public class ProjectUtil {
                     int tempParallelism = tempNode.getMaxParallelism();
                     if (tempParallelism > 0) {
                         tempNode.setMaxParallelism(tempParallelism - 1);
-                        resultNodeMap.put(tempNodeName, resultNodeMap.get(tempNodeName) + 1);
+                        resultNodeMap.merge(tempNodeName, 1, Integer::sum);
                     }
                 }
             }
@@ -240,7 +240,7 @@ public class ProjectUtil {
     }
 
 
-    public PrefixTO getRedisPrefixByUserIdAndProjectIdAndTaksId(String userId, String projectId, String taskId) {
+    public PrefixTO getRedisPrefixByUserIdAndProjectIdAndTaskId(String userId, String projectId, String taskId) {
         //3 获取用户类型（管理员账户、管理员子账户、普通账户、普通子账户）（独占、共享）
         UserPO userPO = userMapper.selectById(userId);
         String roleCode = userPO.getRoleCode();

simulation-resource-scheduler/src/main/resources/kubernetes/template/pod/pod-template.yaml

@@ -18,7 +18,7 @@ spec:
     - name: vtd-container
       image: vtd-image
       imagePullPolicy: IfNotPresent
-      command: [ "/Controller/VTDController", "/Controller/config/docker_cloud.ini", "kafkaTopic" ]
+      command: [ "/Controller/VTDController", "/Controller/config/docker_cloud_carsim.ini", "kafkaTopic" ]
       env:
         - name: PodName
           valueFrom:
@@ -53,6 +53,15 @@ spec:
           cpu: "2.5"
         requests:
           cpu: "1.5"
+    - name: dynamics
+      image: carsim:v1
+      imagePullPolicy: Never
+      command: [ "/root/VTD_CarSim", "/root/result/simfile.sim", "/root/libcarsim.so" ]
+      resources:
+        limits:
+          cpu: "1.0"
+        requests:
+          cpu: "0.5"
   restartPolicy: Never
   volumes:
     - name: nvidia0