소스 검색

调度BUG

LingxinMeng 2 년 전
부모
커밋
be8810b9df

+ 5 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/configuration/redis/CustomRedisClient.java

@@ -46,14 +46,18 @@ public class CustomRedisClient {
      * 加值
      */
     public void increment(String key, long number) {
+        lock(key,1000,10000);
         stringRedisTemplate.opsForValue().increment(key, number);
+        unlock(key);
     }
 
     /**
      * 减值
      */
-    public void decrement(String key, long number) {
+    public  void decrement(String key, long number) {
+        lock(key,1000,10000);
         stringRedisTemplate.opsForValue().decrement(key, number);
+        unlock(key);
     }
 
 

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

@@ -310,7 +310,7 @@ public class ProjectService {
 
 
         //2 删除 kafka 消息
-        ApacheKafkaUtil.deleteTopic(kafkaAdminClient, projectId);
+//        ApacheKafkaUtil.deleteTopic(kafkaAdminClient, projectId);
         //3 删除项目所有任务
         taskMapper.deleteByProject(projectId);
 

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/TaskUtil.java

@@ -453,7 +453,7 @@ public class TaskUtil {
             autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
         }
         // 删除 kafka topic
-        ApacheKafkaUtil.deleteTopic(admin, projectId);
+//        ApacheKafkaUtil.deleteTopic(admin, projectId);
         // 删除 redis 中的 项目运行信息 键值对
         RedisUtil.deleteByPrefix(stringRedisTemplate, redisPrefix.getProjectRunningKey());
         RedisUtil.deleteByPrefix(stringRedisTemplate, "project:" + projectId);