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/04 01:00:06 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-265] Unexpected
broker disappearance in broker list after updating default broker metadata
(#183)
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 170cf29 [TUBEMQ-265] Unexpected broker disappearance in broker list after updating default broker metadata (#183)
170cf29 is described below
commit 170cf29aaa6c33eef69ef0537b1c6b07a766f0b8
Author: Gabriel Zhou <hy...@hotmail.com>
AuthorDate: Sat Jul 4 08:59:57 2020 +0800
[TUBEMQ-265] Unexpected broker disappearance in broker list after updating default broker metadata (#183)
Co-authored-by: Gabriel Zhou <ga...@tencent.com>
---
bin/env.cmd | 2 +-
.../tubemq/server/master/web/handler/WebBrokerDefConfHandler.java | 2 ++
.../tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/env.cmd b/bin/env.cmd
index 248a762..df52f5d 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 -Xms512g -server
\ No newline at end of file
+set BROKER_JVM_OPTS=-Xmx1g -Xms512m -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 5e5df36..e131d2f 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,6 +1218,7 @@ 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);
@@ -1402,6 +1403,7 @@ 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 1120a21..f71e0c7 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,6 +1051,7 @@ 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 =