|
|
@@ -180,7 +180,7 @@ public class TaskService {
|
|
|
List<MqSendLog> residentLogList = configLogsMap.get(residentConfig.getId());
|
|
|
if(mqMsg!= null ){
|
|
|
residentCount = mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged() - residentLogList.size() ;
|
|
|
- log.info("空闲服务器数量为：{},{}",residentConfig.getQueueName(),residentCount);
|
|
|
+ log.info("allocateQueue2空闲服务器数量为：{},{}",residentConfig.getQueueName(),residentCount);
|
|
|
}
|
|
|
//A空闲，BC转A 。B空闲，C转B。C空闲，B转C
|
|
|
for (MqQueueConfig mqQueueConfig : queueConfigList) { // B , C
|
|
|
@@ -194,6 +194,7 @@ public class TaskService {
|
|
|
if(residentCount >0 && !msgList.isEmpty()){
|
|
|
Integer updateCount = updateMqSendLogConfig(residentCount, mqQueueConfig.getId(), residentConfig.getId(), mqSendLogs, queueConfigList);
|
|
|
residentCount = residentCount - updateCount;
|
|
|
+ log.info("allocateQueue2-调配成功：{},to:{},count:{}",mqQueueConfig.getQueueName(),residentConfig.getQueueName(),updateCount);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -252,7 +253,7 @@ public class TaskService {
|
|
|
|
|
|
Integer ecsCount = countMap.get(mqQueueConfig.getQueueName());
|
|
|
MqMsg mqMsg = mqMsgMap.get(mqQueueConfig.getQueueName());
|
|
|
- Boolean flag = mqQueueConfig.getOpenScalingTime() == 0 || checkOpenCount / 2 % mqQueueConfig.getOpenScalingTime() == 0;
|
|
|
+ Boolean flag = mqQueueConfig.getOpenScalingTime() == 0 || checkOpenCount % mqQueueConfig.getOpenScalingTime() * 2 == 0;
|
|
|
//未在计算的服务器数量
|
|
|
Integer noModelingCount = mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged();
|
|
|
//未启动的服务器数量
|
lyhzzz