You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by go...@apache.org on 2020/10/22 06:53:29 UTC

[incubator-tubemq] branch master updated: [TUBEMQ-379]Modify the memory cache size default to 3M (#289)

This is an automated email from the ASF dual-hosted git repository.

gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 36b4a67  [TUBEMQ-379]Modify the memory cache size default to 3M (#289)
36b4a67 is described below

commit 36b4a6757c9336a90f52419b8b4ba582aa8fff6e
Author: gosonzhang <46...@qq.com>
AuthorDate: Thu Oct 22 14:53:20 2020 +0800

    [TUBEMQ-379]Modify the memory cache size default to 3M (#289)
    
    Co-authored-by: gosonzhang <go...@tencent.com>
---
 .../server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java   | 6 +++---
 .../tubemq/server/master/web/handler/WebBrokerDefConfHandler.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
index caaed66..176c39a 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
@@ -83,7 +83,7 @@ public class BrokerSyncStatusInfo {
     private int unFlushDataHold = TServerConstants.CFG_DEFAULT_DATA_UNFLUSH_HOLD;
     private int unflushThreshold = 1000;        //flush threshold
     private int unflushInterval = 10000;        //flush interval
-    private int memCacheMsgSizeInMB = 2;        //memory cache size
+    private int memCacheMsgSizeInMB = 3;        //memory cache size
     private int memCacheMsgCntInK = 10;         //memory cache message count
     private int memCacheFlushIntvl = 20000;     //memory cache flush interval
     private String deletePolicy = "delete,168h";    //data delete policy
@@ -494,7 +494,7 @@ public class BrokerSyncStatusInfo {
                 this.acceptSubscribe = true;
                 this.memCacheFlushIntvl = 20000;
                 this.memCacheMsgCntInK = 10;
-                this.memCacheMsgSizeInMB = 2;
+                this.memCacheMsgSizeInMB = 3;
             } else {
                 String[] brokerDefaultConfInfoArr =
                         brokerDefaultConfInfo.split(TokenConstants.ATTR_SEP);
@@ -622,7 +622,7 @@ public class BrokerSyncStatusInfo {
         final String deletePolicy = brokerDefaultConfInfoArr[6];
         int numTopicStores = 1;
         int unFlushDataHold = TServerConstants.CFG_DEFAULT_DATA_UNFLUSH_HOLD;
-        int memCacheMsgSizeInMB = 2;
+        int memCacheMsgSizeInMB = 3;
         int memCacheMsgCntInK = 10;
         int memCacheFlushIntvl = 20000;
         if (!TStringUtils.isBlank(brokerDefaultConfInfoArr[7])) {
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
index e131d2f..cdcc054 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
@@ -250,7 +250,7 @@ public class WebBrokerDefConfHandler {
             int memCacheMsgSizeInMB =
                     WebParameterUtils.validIntDataParameter("memCacheMsgSizeInMB",
                             req.getParameter("memCacheMsgSizeInMB"),
-                            false, 2, 2);
+                            false, 3, 2);
             memCacheMsgSizeInMB = memCacheMsgSizeInMB >= 2048 ? 2048 : memCacheMsgSizeInMB;
             int memCacheFlushIntvl =
                     WebParameterUtils.validIntDataParameter("memCacheFlushIntvl",
@@ -438,7 +438,7 @@ public class WebBrokerDefConfHandler {
                                     jsonObject.get("memCacheMsgCntInK"), false, 10, 1);
                     int memCacheMsgSizeInMB =
                             WebParameterUtils.validIntDataParameter("memCacheMsgSizeInMB",
-                                    jsonObject.get("memCacheMsgSizeInMB"), false, 2, 2);
+                                    jsonObject.get("memCacheMsgSizeInMB"), false, 3, 2);
                     memCacheMsgSizeInMB = memCacheMsgSizeInMB >= 2048 ? 2048 : memCacheMsgSizeInMB;
                     int memCacheFlushIntvl =
                             WebParameterUtils.validIntDataParameter("memCacheFlushIntvl",