From 2697e134318fc263b4e5707d5bc32682a303bb1b Mon Sep 17 00:00:00 2001
From: gosonzhang <4675739@qq.com>
Date: Fri, 3 Jul 2020 11:35:02 +0000
Subject: [PATCH] Revert "BugFix: Need to set dummy element to be NOT-DEFINED,
 or the data validation routine will fail the check of metadata settings,
 resulting the disappearance in broker list. (#180)" (#181)

This reverts commit 878b4b0d86f7274712b4b5d0f6a74ab64fdb3fd3.
---
 bin/env.cmd                                                     | 2 +-
 .../server/master/web/handler/WebBrokerDefConfHandler.java      | 2 --
 .../server/master/web/handler/WebBrokerTopicConfHandler.java    | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bin/env.cmd b/bin/env.cmd
index df52f5de034..248a76280fe 100644
--- 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
\ No newline at end of file
+set BROKER_JVM_OPTS=-Xmx1g -Xms512g -server
\ No newline at end of file
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 e131d2f7e55..5e5df369836 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
@@ -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/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
index f71e0c7d67b..1120a216175 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
+++ b/tubemq-server/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 =