Merge pull request #302 from minusmajun/master

重试队列拉取比率过低问题
jd-opensource · Sep 7, 2020 · 0919c12 · 0919c12
2 parents dcf7feb + 55b44d7
commit 0919c12
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.../joyqueue-broker-core/src/main/java/org/joyqueue/broker/consumer/CasPartitionManager.java b/.../joyqueue-broker-core/src/main/java/org/joyqueue/broker/consumer/CasPartitionManager.java
@@ -223,10 +223,16 @@ public boolean isRetry(Consumer consumer) throws JoyQueueException {
 
         Boolean retry = clusterManager.getConsumerPolicy(TopicName.parse(consumer.getTopic()), consumer.getApp()).getRetry();
         List<Short> masterPartitionList = clusterManager.getLocalPartitions(TopicName.parse(consumer.getTopic()));
-        if (!retry.booleanValue() || !masterPartitionList.contains((short) 0)) {
+
+        if (!retry) {
             logger.debug("retry enable is false.");
             return false;
         }
+        if (randomBound == 1) {
+            return true;
+        } else if (!masterPartitionList.contains((short) 0)) {
+            return false;
+        }
 
         int val = random.nextInt(randomBound);
         // 重试管理中获取从重试分区消费的概率