This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch INLONG-570
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/INLONG-570 by this push:
new 82245b6 [INLONG-1441]Repair Broker configuration API bugs (#1442)
82245b6 is described below
commit 82245b69c3fa4843f512a7d99a2e73a8bea9ddd3
Author: gosonzhang <[email protected]>
AuthorDate: Wed Aug 18 18:11:34 2021 +0800
[INLONG-1441]Repair Broker configuration API bugs (#1442)
---
.../resources/assets/scripts/common/module.js | 8 +++---
.../server/common/statusdef/ManageStatus.java | 10 +++++++
.../server/master/metamanage/MetaDataManager.java | 26 -----------------
.../metastore/dao/entity/BrokerConfEntity.java | 4 ---
.../nodemanage/nodebroker/BrokerRunStatusInfo.java | 8 ++++--
.../master/web/handler/WebBrokerConfHandler.java | 33 +++++++++++-----------
6 files changed, 35 insertions(+), 54 deletions(-)
diff --git a/inlong-tubemq/resources/assets/scripts/common/module.js
b/inlong-tubemq/resources/assets/scripts/common/module.js
index 8a0c5a9..c761bfd 100644
--- a/inlong-tubemq/resources/assets/scripts/common/module.js
+++ b/inlong-tubemq/resources/assets/scripts/common/module.js
@@ -1054,12 +1054,12 @@ CheckBox.prototype.process = function (type, $target,
dialogInstance, ext, callb
var types = {
'sub': {
'text': '订阅broker',
- 'api': 'admin_set_broker_read_or_write&isAcceptSubscribe=' +
stateStr + '&brokerId='
+ 'api': 'admin_set_broker_read_or_write&acceptSubscribe=' +
stateStr + '&brokerId='
+ ext
},
'pub': {
'text': '发布broker',
- 'api': 'admin_set_broker_read_or_write&isAcceptPublish=' +
stateStr + '&brokerId=' + ext
+ 'api': 'admin_set_broker_read_or_write&acceptPublish=' + stateStr
+ '&brokerId=' + ext
},
'setTopicAuth': {
'text': 'topic的消费组授权控制',
@@ -1110,12 +1110,12 @@ CheckBox.prototype.processTopic = function (type,
$target, dialogInstance, ext,
var types = {
'sub': {
'text': '订阅broker',
- 'api': 'admin_set_broker_read_or_write&isAcceptSubscribe=' +
stateStr + '&brokerId='
+ 'api': 'admin_set_broker_read_or_write&acceptSubscribe=' +
stateStr + '&brokerId='
+ ext
},
'pub': {
'text': '发布broker',
- 'api': 'admin_set_broker_read_or_write&isAcceptPublish=' +
stateStr + '&brokerId=' + ext
+ 'api': 'admin_set_broker_read_or_write&acceptPublish=' + stateStr
+ '&brokerId=' + ext
},
'setTopicAuth': {
'text': 'topic的消费组授权控制',
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/statusdef/ManageStatus.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/statusdef/ManageStatus.java
index ed811bb..ebf9ac8 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/statusdef/ManageStatus.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/statusdef/ManageStatus.java
@@ -86,6 +86,16 @@ public enum ManageStatus {
"unknown broker manage status code %s", code));
}
+ public static ManageStatus descOf(String description) {
+ for (ManageStatus status : ManageStatus.values()) {
+ if (status.getDescription().equalsIgnoreCase(description)) {
+ return status;
+ }
+ }
+ throw new IllegalArgumentException(String.format(
+ "unknown broker manage status name %s", description));
+ }
+
/**
* Change broker read write status
*
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
index 9a7ba37..61e7927 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
@@ -475,32 +475,6 @@ public class MetaDataManager implements Server {
}
/**
- * Modify broker configure information
- *
- * @param entity the broker configure entity will be update
- * @param strBuffer the print information string buffer
- * @param result the process result return
- * @return true if success otherwise false
- */
- public boolean modBrokerConfig(BrokerConfEntity entity,
- StringBuilder strBuffer,
- ProcessResult result) {
- metaStoreService.updBrokerConf(entity, strBuffer, result);
- return result.isSuccess();
- }
-
- /**
- * Get broker configure information
- *
- * @param qryEntity
- * @return broker configure information
- */
- public Map<Integer, BrokerConfEntity> confGetBrokerConfInfo(
- BrokerConfEntity qryEntity) {
- return metaStoreService.getBrokerConfInfo(qryEntity);
- }
-
- /**
* Get broker configure information
*
* @param qryEntity
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/BrokerConfEntity.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/BrokerConfEntity.java
index 19cc299..b3f0f2d 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/BrokerConfEntity.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/BrokerConfEntity.java
@@ -358,8 +358,6 @@ public class BrokerConfEntity extends BaseEntity implements
Cloneable {
.append(",\"brokerTLSPort\":").append(brokerTLSPort)
.append(",\"brokerWebPort\":").append(brokerWebPort)
.append(",\"manageStatus\":\"").append(manageStatus.getDescription()).append("\"")
-
.append(",\"acceptPublish\":").append(manageStatus.isAcceptPublish())
-
.append(",\"acceptSubscribe\":").append(manageStatus.isAcceptSubscribe())
.append(",\"isConfChanged\":").append(isConfUpdated)
.append(",\"isConfLoaded\":").append(isConfLoaded)
.append(",\"regionId\":").append(regionId)
@@ -371,8 +369,6 @@ public class BrokerConfEntity extends BaseEntity implements
Cloneable {
.append(",\"bTlsPort\":").append(brokerTLSPort)
.append(",\"bWebPort\":").append(brokerWebPort)
.append(",\"mSts\":\"").append(manageStatus.getDescription()).append("\"")
-
.append(",\"accPub\":").append(manageStatus.isAcceptPublish())
-
.append(",\"accSub\":").append(manageStatus.isAcceptSubscribe())
.append(",\"isConfChg\":").append(isConfUpdated)
.append(",\"isConfLd\":").append(isConfLoaded)
.append(",\"rId\":").append(regionId)
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunStatusInfo.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunStatusInfo.java
index 2783472..6fe3c61 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunStatusInfo.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunStatusInfo.java
@@ -185,11 +185,11 @@ public class BrokerRunStatusInfo {
.append(",\"brokerInfo\":\"").append(brokerInfo.getBrokerStrInfo())
.append("\",\"createId\":\"").append(createId)
.append("\",\"isConfChanged\":").append(confStatusTuple.getF0())
- .append("\",\"isConfLoaded\":").append(confStatusTuple.getF1())
+ .append(",\"isConfLoaded\":").append(confStatusTuple.getF1())
.append(",\"confChangeNo\":").append(confChangeNo.get())
.append(",\"curStepStatus\":\"").append(curStepStatus.getDescription())
.append("\",\"nextStepOpTimeInMills\":").append(nextStepOpTimeInMills)
- .append("\",\"confLoadedNo\":").append(confLoadedNo.get())
+ .append(",\"confLoadedNo\":").append(confLoadedNo.get())
.append(",\"isOnline\":").append(isOnline)
.append(",\"isDoneDataLoad\":").append(isDoneDataLoad)
.append(",\"isDoneDataSub\":").append(isDoneDataSub)
@@ -199,7 +199,9 @@ public class BrokerRunStatusInfo {
.append(",\"maxConfLoadedTimeInMs\":").append(maxConfLoadedTimeInMs)
.append(",\"curConfLoadTimeInMs\":").append(curConfLoadTimeInMs)
.append(",\"BrokerSyncData\":");
- return brokerSyncData.toJsonString(sBuffer);
+ brokerSyncData.toJsonString(sBuffer);
+ sBuffer.append("}");
+ return sBuffer;
}
private void goNextStatus(boolean isRegister,
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
index 9ec33d9..51818aa 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.cluster.BrokerInfo;
import org.apache.inlong.tubemq.corebase.utils.AddressUtils;
+import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
@@ -603,6 +604,7 @@ public class WebBrokerConfHandler extends
AbstractWebHandler {
sBuffer.append("{\"brokerId\":").append(entity.getBrokerId())
.append(",\"brokerIp\":\"").append(entity.getBrokerIp())
.append("\",\"brokerPort\":").append(entity.getBrokerPort())
+
.append(",\"brokerWebPort\":").append(entity.getBrokerWebPort())
.append(",\"manageStatus\":\"").append(entity.getManageStatusStr()).append("\"");
if (brokerInfo == null) {
sBuffer.append(",\"brokerTLSPort\":").append(entity.getBrokerTLSPort())
@@ -805,7 +807,6 @@ public class WebBrokerConfHandler extends
AbstractWebHandler {
return buildRetInfo(retInfo, sBuffer);
}
-
/**
* Check if the record is valid
*
@@ -1066,25 +1067,23 @@ public class WebBrokerConfHandler extends
AbstractWebHandler {
private <T> boolean getManageStatusParamValue(T paramCntr,
StringBuilder sBuffer,
ProcessResult result) {
- // get manage status id value
- if (!WebParameterUtils.getIntParamValue(paramCntr,
+ if (!WebParameterUtils.getStringParamValue(paramCntr,
WebFieldDef.MANAGESTATUS, false,
- ManageStatus.STATUS_MANAGE_UNDEFINED.getCode(),
- ManageStatus.STATUS_MANAGE_ONLINE.getCode(),
- ManageStatus.STATUS_MANAGE_OFFLINE.getCode(), sBuffer,
result)) {
+ null, sBuffer, result)) {
return result.isSuccess();
}
- ManageStatus mngStatus;
- // parse manage status;
- int manageStatusId = (int) result.getRetData();
- try {
- mngStatus = ManageStatus.valueOf(manageStatusId);
- } catch (Throwable e) {
- result.setFailResult(DataOpErrCode.DERR_ILLEGAL_VALUE.getCode(),
- sBuffer.append("Illegal
").append(WebFieldDef.MANAGESTATUS.name)
- .append(" parameter value
:").append(e.getMessage()).toString());
- sBuffer.delete(0, sBuffer.length());
- return result.isSuccess();
+ String statusInfo = (String) result.getRetData();
+ ManageStatus mngStatus = ManageStatus.STATUS_MANAGE_UNDEFINED;
+ if (TStringUtils.isNotBlank(statusInfo)) {
+ try {
+ mngStatus = ManageStatus.descOf(statusInfo);
+ } catch (Throwable e) {
+
result.setFailResult(DataOpErrCode.DERR_ILLEGAL_VALUE.getCode(),
+ sBuffer.append("Illegal
").append(WebFieldDef.MANAGESTATUS.name)
+ .append(" parameter value
:").append(e.getMessage()).toString());
+ sBuffer.delete(0, sBuffer.length());
+ return result.isSuccess();
+ }
}
result.setSuccResult(mngStatus);
return result.isSuccess();
