lyhzzz 1 rok temu
rodzic
commit
a851f1dab2

+ 1 - 1
src/main/java/com/fdkankan/mqcontroller/task/TaskController.java

@@ -15,7 +15,7 @@ public class TaskController {
     TaskService taskService;
 
 
-    @Scheduled(cron = "*/60 * * * * ?") // 每60秒执行一次(使用cron表达式)
+    @Scheduled(cron = "*/30 * * * * ?") // 每30秒执行一次(使用cron表达式)
     public void runTask(){
         try {
             taskService.runTask();

+ 2 - 8
src/main/java/com/fdkankan/mqcontroller/task/TaskService.java

@@ -221,7 +221,7 @@ public class TaskService {
 
         Integer ecsCount = countMap.get(mqQueueConfig.getQueueName());
         MqMsg mqMsg = mqMsgMap.get(mqQueueConfig.getQueueName());
-        Boolean flag = mqQueueConfig.getOpenScalingTime() == 0 || checkOpenCount % mqQueueConfig.getOpenScalingTime() == 0;
+        Boolean flag = mqQueueConfig.getOpenScalingTime() == 0 || checkOpenCount / 2 % mqQueueConfig.getOpenScalingTime() == 0;
         //未在计算的服务器数量
         Integer noModelingCount = mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged();
         //未启动的服务器数量
@@ -305,7 +305,6 @@ public class TaskService {
     }
 
 
-
     /**
      * 关闭弹性伸缩
      */
@@ -324,6 +323,7 @@ public class TaskService {
 
             String modelingKey = String.format(RedisKey.modelingKey,take.getMqEcs().getEcsName());
             if(redisUtil.hasKey(modelingKey)){
+                log.info("delEcsList--有场景正在计算中:{},{}",modelingKey,redisUtil.get(modelingKey));
                 redisUtil.del(stopKey);
                 return;
             }
@@ -341,10 +341,6 @@ public class TaskService {
     }
 
 
-
-
-
-
     public synchronized Boolean createEcs(MqScalingConfig mqScaling){
         try {
             return ECSUtils.createEcs(mqScaling.getAccessKey(),mqScaling.getSecret(),mqScaling.getEndpoint(),mqScaling.getScalingRuleAri());
@@ -364,6 +360,4 @@ public class TaskService {
         return false;
     }
 
-
-
 }