Polish tests, separate ports, disable log, etc.

README.md

 ## Apache RocketMQ [![Build Status](https://travis-ci.org/apache/rocketmq.svg?branch=master)](https://travis-ci.org/apache/rocketmq) [![Coverage Status](https://coveralls.io/repos/github/apache/rocketmq/badge.svg?branch=master)](https://coveralls.io/github/apache/rocketmq?branch=master)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.rocketmq/rocketmq-all/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.rocketmq)
-[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://rocketmq.apache.org/dowloading/releases)
+[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)]
+(https://rocketmq.apache.org/dowloading/releases)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 **[Apache RocketMQ](https://rocketmq.apache.org) is a distributed messaging and streaming platform with low latency, high performance and reliability, trillion-level capacity and flexible scalability.**
@@ -47,3 +48,5 @@ We always welcome new contributions, whether for trivial cleanups, big new featu
 ----------
 ## License
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright (C) Apache Software Foundation
+
+

broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java

@@ -23,7 +23,6 @@ import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.constant.PermName;
 import org.apache.rocketmq.common.filter.ExpressionType;
-import org.apache.rocketmq.logging.InternalLogger;
 import org.apache.rocketmq.common.protocol.RequestCode;
 import org.apache.rocketmq.common.protocol.ResponseCode;
 import org.apache.rocketmq.common.protocol.body.CheckClientRequestBody;
@@ -36,6 +35,7 @@ import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
 import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.common.sysflag.TopicSysFlag;
 import org.apache.rocketmq.filter.FilterFactory;
+import org.apache.rocketmq.logging.InternalLogger;
 import org.apache.rocketmq.logging.InternalLoggerFactory;
 import org.apache.rocketmq.remoting.common.RemotingHelper;
 import org.apache.rocketmq.remoting.exception.RemotingCommandException;

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

@@ -548,10 +548,10 @@ public class MQClientInstance {
                                 }
                             } catch (Exception e) {
                                 if (this.isBrokerInNameServer(addr)) {
-                                    log.info("send heart beat to broker[{} {} {}] failed", brokerName, id, addr);
+                                    log.info("send heart beat to broker[{} {} {}] failed", brokerName, id, addr, e);
                                 } else {
                                     log.info("send heart beat to broker[{} {} {}] exception, because the broker not up, forget it", brokerName,
-                                        id, addr);
+                                        id, addr, e);
                                 }
                             }
                         }

store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShutDownTest.java

@@ -42,9 +42,9 @@ public class DefaultMessageStoreShutDownTest {
     public void init() throws Exception {
         messageStore = spy(buildMessageStore());
         boolean load = messageStore.load();
-        when(messageStore.dispatchBehindBytes()).thenReturn(100L);
         assertTrue(load);
         messageStore.start();
+        when(messageStore.dispatchBehindBytes()).thenReturn(100L);
     }
 
     @Test

store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java

@@ -115,7 +115,7 @@ public class MessageStoreTestBase extends StoreTestBase {
 
     protected void doGetMessages(MessageStore messageStore, String topic, int queueId, int num, long beginLogicsOffset) {
         for (int i = 0; i < num; i++) {
-            GetMessageResult getMessageResult =  messageStore.getMessage("group", topic, 0, beginLogicsOffset + i, 3, null);
+            GetMessageResult getMessageResult =  messageStore.getMessage("group", topic, queueId, beginLogicsOffset + i, 3, null);
             Assert.assertNotNull(getMessageResult);
             Assert.assertTrue(!getMessageResult.getMessageBufferList().isEmpty());
             MessageExt messageExt = MessageDecoder.decode(getMessageResult.getMessageBufferList().get(0));

store/src/test/resources/logback-test.xml

@@ -28,7 +28,7 @@
         <appender-ref ref="STDOUT"/>
     </logger>
 
-    <root level="ERROR">
+    <root level="OFF">
         <appender-ref ref="STDOUT"/>
     </root>
 

test/src/main/java/org/apache/rocketmq/test/factory/ConsumerFactory.java

@@ -17,6 +17,7 @@
 
 package org.apache.rocketmq.test.factory;
 
+import java.util.UUID;
 import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer;
 import org.apache.rocketmq.client.consumer.MessageSelector;
 import org.apache.rocketmq.test.client.rmq.RMQBroadCastConsumer;
@@ -64,6 +65,7 @@ public class ConsumerFactory {
 
     public static DefaultMQPullConsumer getRMQPullConsumer(String nsAddr, String consumerGroup) throws Exception {
         DefaultMQPullConsumer defaultMQPullConsumer = new DefaultMQPullConsumer(consumerGroup);
+        defaultMQPullConsumer.setInstanceName(UUID.randomUUID().toString());
         defaultMQPullConsumer.setNamesrvAddr(nsAddr);
         defaultMQPullConsumer.start();
         return defaultMQPullConsumer;

test/src/main/java/org/apache/rocketmq/test/factory/ProducerFactory.java

@@ -17,6 +17,7 @@
 
 package org.apache.rocketmq.test.factory;
 
+import java.util.UUID;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.test.util.RandomUtil;
@@ -25,6 +26,7 @@ public class ProducerFactory {
 
     public static DefaultMQProducer getRMQProducer(String ns) {
         DefaultMQProducer producer = new DefaultMQProducer(RandomUtil.getStringByUUID());
+        producer.setInstanceName(UUID.randomUUID().toString());
         producer.setNamesrvAddr(ns);
         try {
             producer.start();

test/src/main/java/org/apache/rocketmq/test/util/MQAdmin.java

@@ -19,6 +19,7 @@ package org.apache.rocketmq.test.util;
 
 import java.util.HashMap;
 import java.util.Set;
+import java.util.UUID;
 import org.apache.log4j.Logger;
 import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.protocol.body.ClusterInfo;
@@ -40,6 +41,7 @@ public class MQAdmin {
         int queueNum, int waitTimeSec) {
         boolean createResult = false;
         DefaultMQAdminExt mqAdminExt = new DefaultMQAdminExt();
+        mqAdminExt.setInstanceName(UUID.randomUUID().toString());
         mqAdminExt.setNamesrvAddr(nameSrvAddr);
         try {
             mqAdminExt.start();

test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java

@@ -39,7 +39,7 @@ public class BaseConf {
     protected static String clusterName;
     protected static int brokerNum;
     protected static int waitTime = 5;
-    protected static int consumeTime = 5 * 60 * 1000;
+    protected static int consumeTime = 2 * 60 * 1000;
     protected static NamesrvController namesrvController;
     protected static BrokerController brokerController1;
     protected static BrokerController brokerController2;

test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java

@@ -50,10 +50,10 @@ public class IntegrationTestBase {
     protected static final int COMMIT_LOG_SIZE = 1024 * 1024 * 100;
     protected static final int INDEX_NUM = 1000;
 
-    private static final AtomicInteger port = new AtomicInteger(50000);
+    private static final AtomicInteger port = new AtomicInteger(40000);
 
     public static synchronized int nextPort() {
-        return port.addAndGet(5);
+        return port.addAndGet(random.nextInt(10) + 10);
     }
     protected static Random random = new Random();
 
@@ -110,7 +110,7 @@ public class IntegrationTestBase {
         namesrvConfig.setKvConfigPath(baseDir + SEP + "namesrv" + SEP + "kvConfig.json");
         namesrvConfig.setConfigStorePath(baseDir + SEP + "namesrv" + SEP + "namesrv.properties");
 
-        nameServerNettyServerConfig.setListenPort(9000 + random.nextInt(1000));
+        nameServerNettyServerConfig.setListenPort(nextPort());
         NamesrvController namesrvController = new NamesrvController(namesrvConfig, nameServerNettyServerConfig);
         try {
             Assert.assertTrue(namesrvController.initialize());

test/src/test/java/org/apache/rocketmq/test/base/dledger/DLedgerProduceAndConsumeIT.java

@@ -19,12 +19,13 @@ import org.apache.rocketmq.test.base.IntegrationTestBase;
 import org.apache.rocketmq.test.factory.ConsumerFactory;
 import org.apache.rocketmq.test.factory.ProducerFactory;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.rocketmq.test.base.IntegrationTestBase.nextPort;
 import static sun.util.locale.BaseLocale.SEP;
 
-public class ProduceAndConsumeTest {
+public class DLedgerProduceAndConsumeIT {
 
     public BrokerConfig buildBrokerConfig(String cluster, String brokerName) {
         BrokerConfig brokerConfig =  new BrokerConfig();
@@ -58,7 +59,7 @@ public class ProduceAndConsumeTest {
         BrokerConfig brokerConfig = buildBrokerConfig(cluster, brokerName);
         MessageStoreConfig storeConfig = buildStoreConfig(brokerName, peers, selfId);
         BrokerController brokerController = IntegrationTestBase.createAndStartBroker(storeConfig, brokerConfig);
-        Thread.sleep(1000);
+        Thread.sleep(3000);
 
         Assert.assertEquals(BrokerRole.SYNC_MASTER, storeConfig.getBrokerRole());
 
@@ -97,6 +98,8 @@ public class ProduceAndConsumeTest {
             Assert.assertArrayEquals(("Hello" + i).getBytes(), messageExt.getBody());
         }
 
+        producer.shutdown();
+        consumer.shutdown();
         brokerController.shutdown();
     }
 }

test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/order/OrderMsgBroadCastIT.java

@@ -29,10 +29,15 @@ import org.apache.rocketmq.test.util.TestUtils;
 import org.apache.rocketmq.test.util.VerifyUtils;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static com.google.common.truth.Truth.assertThat;
 
+/**
+ * Currently, dose not support the ordered broadcast message
+ */
+@Ignore
 public class OrderMsgBroadCastIT extends BaseBroadCastIT {
     private static Logger logger = Logger.getLogger(OrderMsgBroadCastIT.class);
     private RMQNormalProducer producer = null;

test/src/test/java/org/apache/rocketmq/test/delay/NormalMsgDelayIT.java

@@ -51,7 +51,8 @@ public class NormalMsgDelayIT extends DelayConf {
     }
 
     @Test
-    public void testDelayLevell() {
+    public void testDelayLevel1() throws Exception {
+        Thread.sleep(3000);
         int delayLevel = 1;
         List<Object> delayMsgs = MQMessageFactory.getDelayMsg(topic, delayLevel, msgSize);
         producer.send(delayMsgs);