Revert "BugFix: Need to set dummy element to be NOT-DEFINED, or the d…

…ata validation routine will fail the check of metadata settings, resulting the disappearance in broker list. (apache#180)" (apache#181) This reverts commit 878b4b0.
kinfuy · Jul 3, 2020 · 2697e13 · 2697e13
1 parent 878b4b0
commit 2697e13
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/bin/env.cmd b/bin/env.cmd
@@ -28,4 +28,4 @@ set JAVA="%JAVA_HOME%\bin\java"
 
 REM One may add extra Java runtime flags in addition to each role: Master or Broker
 set MASTER_JVM_OPTS=-Xmx1g -Xms256m -server
-set BROKER_JVM_OPTS=-Xmx1g -Xms512m -server
+set BROKER_JVM_OPTS=-Xmx1g -Xms512g -server
diff --git a/...er/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java b/...er/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
@@ -1218,7 +1218,6 @@ public StringBuilder adminQueryBrokerRunStatusInfo(HttpServletRequest req) throw
         StringBuilder strBuffer = new StringBuilder(512);
         try {
             BdbBrokerConfEntity brokerConfEntity = new BdbBrokerConfEntity();
-            brokerConfEntity.setDftUnFlushDataHold(TBaseConstants.META_VALUE_UNDEFINED);
             boolean withDetail =
                 WebParameterUtils.validBooleanDataParameter("withDetail",
                     req.getParameter("withDetail"), false, false);
@@ -1403,7 +1402,6 @@ public StringBuilder adminQueryBrokerRunStatusInfo(HttpServletRequest req) throw
     public StringBuilder adminQueryBrokerDefConfEntityInfo(HttpServletRequest req) throws Exception {
         StringBuilder strBuffer = new StringBuilder(512);
         BdbBrokerConfEntity brokerConfEntity = new BdbBrokerConfEntity();
-        brokerConfEntity.setDftUnFlushDataHold(TBaseConstants.META_VALUE_UNDEFINED);
         try {
             brokerConfEntity
                     .setRecordCreateUser(WebParameterUtils.validStringParameter("createUser",

diff --git a/.../src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java b/.../src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
@@ -1051,7 +1051,6 @@ public StringBuilder adminQueryBrokerTopicCfgAndRunInfo(
             webTopicEntity.setMemCacheMsgSizeInMB(TBaseConstants.META_VALUE_UNDEFINED);
             webTopicEntity.setMemCacheMsgCntInK(TBaseConstants.META_VALUE_UNDEFINED);
             webTopicEntity.setMemCacheFlushIntvl(TBaseConstants.META_VALUE_UNDEFINED);
-            webTopicEntity.setUnflushDataHold(TBaseConstants.META_VALUE_UNDEFINED);
             Map<Integer, BdbBrokerConfEntity> totalBrokers =
                     brokerConfManager.getBrokerConfStoreMap();
             Map<Integer, BrokerSyncStatusInfo> brokerSyncStatusInfoMap =