root 2 éve
szülő
commit
ed8f37535d

+ 2 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/configuration/redis/CustomRedisClient.java

@@ -17,6 +17,8 @@ public class CustomRedisClient {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
+    //* -------------------------------- Comment --------------------------------
+
     public String get(String key) {
         return stringRedisTemplate.opsForValue().get(key);
     }

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java

@@ -5,8 +5,8 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.util.*;
 import com.css.simulation.resource.scheduler.entity.*;
-import com.css.simulation.resource.scheduler.manager.ProjectManager;
-import com.css.simulation.resource.scheduler.manager.TaskManager;
+import com.css.simulation.resource.scheduler.service.ProjectManager;
+import com.css.simulation.resource.scheduler.service.TaskManager;
 import com.css.simulation.resource.scheduler.mapper.*;
 import com.css.simulation.resource.scheduler.service.ProjectService;
 import com.css.simulation.resource.scheduler.util.ApacheKafkaUtil;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/entity/CpuNodeEntity.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class CpuNodeEntity implements Cloneable {
-    private String name;
+    private String hostname;
     private Integer parallelism;
 
     @Override

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/entity/GpuNodeEntity.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class GpuNodeEntity implements Cloneable {
-    private String name;
+    private String hostname;
     private Integer parallelism;
 
 

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

@@ -1,11 +0,0 @@
-package com.css.simulation.resource.scheduler.resource;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class TaskLock {
-
-
-}

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/ProjectManager.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/ProjectManager.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.manager;
+package com.css.simulation.resource.scheduler.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.FileUtil;

+ 0 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/ProjectService.java

@@ -9,7 +9,6 @@ import com.css.simulation.resource.scheduler.configuration.kubernetes.Kubernetes
 import com.css.simulation.resource.scheduler.entity.AlgorithmEntity;
 import com.css.simulation.resource.scheduler.entity.IndexTemplateEntity;
 import com.css.simulation.resource.scheduler.entity.SceneEntity;
-import com.css.simulation.resource.scheduler.manager.ProjectManager;
 import com.css.simulation.resource.scheduler.mapper.*;
 import com.css.simulation.resource.scheduler.entity.PrefixEntity;
 import com.css.simulation.resource.scheduler.util.*;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskIndexManager.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/TaskIndexManager.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.manager;
+package com.css.simulation.resource.scheduler.service;
 
 import com.css.simulation.resource.scheduler.mapper.IndexMapper;
 import com.css.simulation.resource.scheduler.entity.LeafIndexEntity;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskManager.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/TaskManager.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.manager;
+package com.css.simulation.resource.scheduler.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;

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

@@ -3,7 +3,6 @@ package com.css.simulation.resource.scheduler.service;
 import com.css.simulation.resource.scheduler.entity.PrefixEntity;
 import com.css.simulation.resource.scheduler.entity.ProjectEntity;
 import com.css.simulation.resource.scheduler.entity.TaskEntity;
-import com.css.simulation.resource.scheduler.manager.TaskManager;
 import com.css.simulation.resource.scheduler.mapper.TaskMapper;
 import com.css.simulation.resource.scheduler.util.ProjectUtil;
 import lombok.SneakyThrows;

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

@@ -518,8 +518,8 @@ public class ProjectUtil {
     }
 
     public void resetNodeParallelism() {
-        kubernetesConfiguration.getNodeList().forEach((node) -> customRedisClient.set("gpu-node:" + node.getName() + ":parallelism", node.getParallelism() + ""));
-        esminiConfiguration.getNodeList().forEach((node) -> customRedisClient.set("cpu-node:" + node.getName() + ":parallelism", node.getParallelism() + ""));
+        kubernetesConfiguration.getNodeList().forEach((node) -> customRedisClient.set("gpu-node:" + node.getHostname() + ":parallelism", node.getParallelism() + ""));
+        esminiConfiguration.getNodeList().forEach((node) -> customRedisClient.set("cpu-node:" + node.getHostname() + ":parallelism", node.getParallelism() + ""));
     }
 
     /**