Merge pull request #17 from wqliang/fixPotentialOverflow

fix potential overflow and limit upper bound
apache · May 8, 2020 · 305eef0 · 305eef0
2 parents 0deef8b + 14376b6
commit 305eef0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java b/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java
@@ -84,7 +84,8 @@ private void adjustQueueNumByConsumerCount(String topic, AdjustType scaleType) {
 
             case DECREASE_QUEUE_NUM:
                 adjustWriteQueueNumByConsumerCount(topic, 0, scaleType);
-                long delayTimeMillis = deFiBrokerController.getDeFiBusBrokerConfig().getScaleQueueSizeDelayTimeMinute() * 60 * 1000;
+                long delayTimeMinutes = Math.min(deFiBrokerController.getDeFiBusBrokerConfig().getScaleQueueSizeDelayTimeMinute(), 10);
+                long delayTimeMillis = delayTimeMinutes * 60 * 1000;
                 adjustReadQueueNumByConsumerCount(topic, delayTimeMillis, scaleType);
                 break;
         }