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/07/03 11:35:12 UTC
[incubator-tubemq] branch master updated: 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 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 2697e13 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)
2697e13 is described below
commit 2697e134318fc263b4e5707d5bc32682a303bb1b
Author: gosonzhang <46...@qq.com>
AuthorDate: Fri Jul 3 11:35:02 2020 +0000
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 +-
.../tubemq/server/master/web/handler/WebBrokerDefConfHandler.java | 2 --
.../tubemq/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 df52f5d..248a762 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 e131d2f..5e5df36 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 class WebBrokerDefConfHandler {
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 class WebBrokerDefConfHandler {
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 f71e0c7..1120a21 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 class WebBrokerTopicConfHandler {
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 =