|
@@ -336,7 +336,13 @@ public class TaskService {
|
|
|
boolean flag = delList.stream().anyMatch(e -> e.getMqEcs().getEcsName().equals(mqEcs.getEcsName()));
|
|
|
if(between >= mqQueueConfig.getStopScalingTime() + 60 * count && !flag){
|
|
|
List<MqSendLog> mqSendLogs = configLogsMap.get(mqQueueConfig.getId());
|
|
|
+ if(mqSendLogs == null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
MqMsg mqMsg = mqMsgMap.get(mqEcs.getQueueName());
|
|
|
+ if(mqMsg == null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
Integer notModelingCount = mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged() - mqMsg.getMessages_ready();
|
|
|
if(mqSendLogs.size() - (notModelingCount + mqQueueConfig.getScalingThreshold()) >0 ){
|
|
|
log.info("待计算数量:{}大于空闲服务数量:{},阈值{},不关闭",mqSendLogs.size(),notModelingCount,mqQueueConfig.getScalingThreshold());
|