From dbc5987b4ac6460f0763b52154078ace35566f24 Mon Sep 17 00:00:00 2001
From: dongeforever <dongeforever@apache.org>
Date: Wed, 7 Nov 2018 11:45:54 +0800
Subject: [PATCH] Fix tests

---
 .../test/java/org/apache/rocketmq/store/StoreTestBase.java  | 6 +++---
 .../apache/rocketmq/store/dleger/DLegerCommitlogTest.java   | 4 ++++
 .../org/apache/rocketmq/test/base/IntegrationTestBase.java  | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/store/src/test/java/org/apache/rocketmq/store/StoreTestBase.java b/store/src/test/java/org/apache/rocketmq/store/StoreTestBase.java
index 63638675..9e09d813 100644
--- a/store/src/test/java/org/apache/rocketmq/store/StoreTestBase.java
+++ b/store/src/test/java/org/apache/rocketmq/store/StoreTestBase.java
@@ -21,10 +21,10 @@ public class StoreTestBase {
 
     protected Set<String> baseDirs = new HashSet<>();
 
-    private AtomicInteger port = new AtomicInteger(30000);
+    private static AtomicInteger port = new AtomicInteger(30000);
 
-    public int nextPort() {
-        return port.incrementAndGet();
+    public static synchronized int nextPort() {
+        return port.addAndGet(5);
     }
 
     protected MessageExtBrokerInner buildMessage() {
diff --git a/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java b/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java
index 193bd50c..2a247e4d 100644
--- a/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java
@@ -93,6 +93,7 @@ public class DLegerCommitlogTest extends StoreTestBase {
             Assert.assertEquals(results.get(i).getAppendMessageResult().getWroteOffset(), messageExt.getCommitLogOffset());
         }
         messageStore.destroy();
+        messageStore.shutdown();
     }
 
 
@@ -123,6 +124,9 @@ public class DLegerCommitlogTest extends StoreTestBase {
 
         leaderStore.destroy();
         followerStore.destroy();
+
+        leaderStore.shutdown();
+        followerStore.shutdown();
     }
 
 
diff --git a/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java b/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java
index 8890a587..0ac321e4 100644
--- a/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java
+++ b/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java
@@ -47,7 +47,7 @@ public class IntegrationTestBase {
     protected static final List<BrokerController> BROKER_CONTROLLERS = new ArrayList<>();
     protected static final List<NamesrvController> NAMESRV_CONTROLLERS = new ArrayList<>();
     protected static int topicCreateTime = 30 * 1000;
-    protected static final int COMMIT_LOG_SIZE = 1024 * 1024 * 256;
+    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);
@@ -135,7 +135,7 @@ public class IntegrationTestBase {
         brokerConfig.setEnablePropertyFilter(true);
         storeConfig.setStorePathRootDir(baseDir);
         storeConfig.setStorePathCommitLog(baseDir + SEP + "commitlog");
-        storeConfig.setMapedFileSizeCommitLog(100 * 1024 * 1024);
+        storeConfig.setMapedFileSizeCommitLog(COMMIT_LOG_SIZE);
         storeConfig.setMaxIndexNum(INDEX_NUM);
         storeConfig.setMaxHashSlotNum(INDEX_NUM * 4);
         return createAndStartBroker(storeConfig, brokerConfig);
-- 
GitLab