Merge remote-tracking branch 'refs/remotes/apache/develop' into develop

broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java

@@ -224,7 +224,7 @@ public boolean load() {
         result = result && this.correctDelayOffset();
         return result;
     }
-    
+
     public boolean loadWhenSyncDelayOffset() {
         boolean result = super.load();
         result = result && this.parseDelayLevel();
@@ -377,7 +377,7 @@ public void run() {
                 if (isStarted()) {
                     this.executeOnTimeUp();
                 }
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 // XXX: warn and notify me
                 log.error("ScheduleMessageService, executeOnTimeUp exception", e);
                 this.scheduleNextTimerTask(this.offset, DELAY_FOR_A_PERIOD);

client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java

@@ -42,7 +42,7 @@ public List<MessageQueue> allocate(String consumerGroup, String currentCID, List
         int startIndex = (mod > 0 && index < mod) ? index * averageSize : index * averageSize + mod;
         int range = Math.min(averageSize, mqAll.size() - startIndex);
         for (int i = 0; i < range; i++) {
-            result.add(mqAll.get((startIndex + i) % mqAll.size()));
+            result.add(mqAll.get(startIndex + i));
         }
         return result;
     }

client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java

@@ -525,7 +525,7 @@ private boolean updateProcessQueueTableInRebalance(final String topic, final Set
                 }
 
                 this.removeDirtyOffset(mq);
-                ProcessQueue pq = createProcessQueue(topic);
+                ProcessQueue pq = createProcessQueue();
                 pq.setLocked(true);
                 long nextOffset = this.computePullFromWhere(mq);
                 if (nextOffset >= 0) {
@@ -779,8 +779,6 @@ public boolean removeUnnecessaryPopMessageQueue(final MessageQueue mq, final Pop
 
     public abstract PopProcessQueue createPopProcessQueue();
 
-    public abstract ProcessQueue createProcessQueue(String topicName);
-
     public void removeProcessQueue(final MessageQueue mq) {
         ProcessQueue prev = this.processQueueTable.remove(mq);
         if (prev != null) {

client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceLitePullImpl.java

@@ -177,7 +177,4 @@ public PopProcessQueue createPopProcessQueue() {
         return null;
     }
 
-    public ProcessQueue createProcessQueue(String topicName) {
-        return createProcessQueue();
-    }
 }

client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePullImpl.java

@@ -103,8 +103,4 @@ public PopProcessQueue createPopProcessQueue() {
         return null;
     }
 
-    public ProcessQueue createProcessQueue(String topicName) {
-        return createProcessQueue();
-    }
-
 }

client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImpl.java

@@ -288,11 +288,6 @@ public ProcessQueue createProcessQueue() {
         return new ProcessQueue();
     }
 
-    @Override
-    public ProcessQueue createProcessQueue(String topicName) {
-        return createProcessQueue();
-    }
-
     @Override
     public PopProcessQueue createPopProcessQueue() {
         return new PopProcessQueue();

client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java

@@ -1222,8 +1222,7 @@ public String findBrokerAddrByTopic(final String topic) {
         if (topicRouteData != null) {
             List<BrokerData> brokers = topicRouteData.getBrokerDatas();
             if (!brokers.isEmpty()) {
-                int index = random.nextInt(brokers.size());
-                BrokerData bd = brokers.get(index % brokers.size());
+                BrokerData bd = brokers.get(random.nextInt(brokers.size()));
                 return bd.selectBrokerAddr();
             }
         }

client/src/test/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPIExtTest.java

@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rocketmq.client.impl.mqclient;
+
+import java.util.concurrent.CompletableFuture;
+import org.apache.rocketmq.client.ClientConfig;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.common.utils.FutureUtils;
+import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
+import org.apache.rocketmq.remoting.netty.NettyClientConfig;
+import org.apache.rocketmq.remoting.netty.NettyRemotingClient;
+import org.apache.rocketmq.remoting.protocol.header.SendMessageRequestHeader;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MQClientAPIExtTest {
+    MQClientAPIExt mqClientAPIExt;
+    @Mock
+    NettyRemotingClient remotingClientMock;
+
+    @Before
+    public void before() {
+        mqClientAPIExt = Mockito.spy(new MQClientAPIExt(new ClientConfig(), new NettyClientConfig(), null, null));
+        Mockito.when(mqClientAPIExt.getRemotingClient()).thenReturn(remotingClientMock);
+        Mockito.when(remotingClientMock.invoke(anyString(), any(), anyLong())).thenReturn(FutureUtils.completeExceptionally(new RemotingTimeoutException("addr")));
+    }
+
+    @Test
+    public void sendMessageAsync() {
+        String topic = "test";
+        Message msg = new Message(topic, "test".getBytes());
+        SendMessageRequestHeader requestHeader = new SendMessageRequestHeader();
+        requestHeader.setTopic(topic);
+        requestHeader.setProducerGroup("test");
+        requestHeader.setDefaultTopic("test");
+        requestHeader.setDefaultTopicQueueNums(1);
+        requestHeader.setQueueId(0);
+        requestHeader.setSysFlag(0);
+        requestHeader.setBornTimestamp(0L);
+        requestHeader.setFlag(0);
+        requestHeader.setProperties("test");
+        requestHeader.setReconsumeTimes(0);
+        requestHeader.setUnitMode(false);
+        requestHeader.setBatch(false);
+        CompletableFuture<SendResult> future = mqClientAPIExt.sendMessageAsync("127.0.0.1:10911", "test", msg, requestHeader, 10);
+        assertThatThrownBy(future::get).getCause().isInstanceOf(RemotingTimeoutException.class);
+    }
+}

remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java

@@ -631,7 +631,7 @@ private Channel getAndCreateChannel(final String addr) throws InterruptedExcepti
         if (channelFuture == null) {
             return null;
         }
-        return getAndCreateChannelAsync(addr).awaitUninterruptibly().channel();
+        return channelFuture.awaitUninterruptibly().channel();
     }
 
     private ChannelFuture getAndCreateNameserverChannelAsync() throws InterruptedException {