You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2021/08/21 03:45:59 UTC
[incubator-inlong] branch INLONG-570 updated: [INLONG-1451] Fix the
bugs of topic control api (#1452)
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 de3a15b [INLONG-1451] Fix the bugs of topic control api (#1452)
de3a15b is described below
commit de3a15b4e4e697f3e1792b22d3a78becc98a3041
Author: gosonzhang <46...@qq.com>
AuthorDate: Sat Aug 21 11:45:50 2021 +0800
[INLONG-1451] Fix the bugs of topic control api (#1452)
---
.../inlong/tubemq/server/common/utils/WebParameterUtils.java | 7 ++++---
.../tubemq/server/master/metamanage/MetaDataManager.java | 7 +++++--
.../master/metamanage/metastore/BdbMetaStoreServiceImpl.java | 1 +
.../server/master/web/handler/WebAdminFlowRuleHandler.java | 10 +++++-----
.../tubemq/server/master/web/handler/WebTopicCtrlHandler.java | 4 ++--
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
index b0d6dfe..a5338c4 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
@@ -544,14 +544,15 @@ public class WebParameterUtils {
}
int paramValue = (int) result.getRetData();
if (paramValue == TBaseConstants.META_VALUE_UNDEFINED) {
- return defValue;
+ result.setSuccResult(defValue);
} else {
if (paramValue == 1) {
- return Boolean.TRUE;
+ result.setSuccResult(Boolean.TRUE);
} else {
- return Boolean.FALSE;
+ result.setSuccResult(Boolean.FALSE);
}
}
+ return result.isSuccess();
}
/**
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 a74f1c9..8cd9f5a 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
@@ -942,7 +942,7 @@ public class MetaDataManager implements Server {
.append(brokerId)
.append(", please create the broker's configure first!").toString());
sBuffer.delete(0, sBuffer.length());
- return new TopicProcessResult(brokerId, "", result);
+ return new TopicProcessResult(brokerId, topicName, result);
}
TopicPropGroup newProps;
if (isAddOp) {
@@ -982,7 +982,8 @@ public class MetaDataManager implements Server {
.append(deployEntity.getBrokerId())
.append(", please create the broker's configure first!").toString());
sBuffer.delete(0, sBuffer.length());
- return new TopicProcessResult(deployEntity.getBrokerId(), "", result);
+ return new TopicProcessResult(deployEntity.getBrokerId(),
+ deployEntity.getTopicName(), result);
}
// add topic control configure
if (!addIfAbsentTopicCtrlConf(deployEntity,
@@ -1473,6 +1474,7 @@ public class MetaDataManager implements Server {
sBuffer.append("TopicName ").append(topicName)
.append(" is in using, please delete the deploy info first!")
.toString());
+ sBuffer.delete(0, sBuffer.length());
return result.isSuccess();
}
if (metaStoreService.isTopicNameInUsed(topicName)) {
@@ -1480,6 +1482,7 @@ public class MetaDataManager implements Server {
sBuffer.append("TopicName ").append(topicName)
.append(" is in using, please delete the consume control info first!")
.toString());
+ sBuffer.delete(0, sBuffer.length());
return result.isSuccess();
}
metaStoreService.delTopicCtrlConf(operator, topicName, sBuffer, result);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java
index 756550e..956ec14 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java
@@ -1218,6 +1218,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
.append(stateChangeEvent.getState().name()).toString());
break;
}
+ sBuilder.delete(0, sBuilder.length());
}
});
}
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
index 04b677c..651e25a 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
@@ -73,9 +73,9 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
StringBuilder sBuffer,
ProcessResult result) {
// build query entity
- GroupResCtrlEntity entity = new GroupResCtrlEntity();
+ GroupResCtrlEntity qryEntity = new GroupResCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
- if (!WebParameterUtils.getQueriedOperateInfo(req, entity, sBuffer, result)) {
+ if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
return sBuffer;
}
@@ -100,11 +100,11 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
return sBuffer;
}
Boolean flowCtrlEnable = (Boolean) result.getRetData();
- entity.updModifyInfo(entity.getDataVerId(), null,
+ qryEntity.updModifyInfo(qryEntity.getDataVerId(), null,
TBaseConstants.META_VALUE_UNDEFINED, inQryPriorityId,
flowCtrlEnable, TBaseConstants.META_VALUE_UNDEFINED, null);
Map<String, GroupResCtrlEntity> groupResCtrlEntityMap =
- metaDataManager.confGetGroupResCtrlConf(groupNameSet, entity);
+ metaDataManager.confGetGroupResCtrlConf(groupNameSet, qryEntity);
// build return result
int totalCnt = 0;
WebParameterUtils.buildSuccessWithDataRetBegin(sBuffer);
@@ -115,7 +115,7 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
if (totalCnt++ > 0) {
sBuffer.append(",");
}
- sBuffer = entity.toOldVerFlowCtrlWebJsonStr(sBuffer, true);
+ sBuffer = resCtrlEntity.toOldVerFlowCtrlWebJsonStr(sBuffer, true);
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java
index 107840c..8ffd39c 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java
@@ -244,7 +244,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
WebFieldDef.MAXMSGSIZEINMB, false,
(isAddOp ? maxMsgSizeMB : TBaseConstants.META_VALUE_UNDEFINED),
TBaseConstants.META_MIN_ALLOWED_MESSAGE_SIZE_MB,
- TBaseConstants.META_MAX_ALLOWED_MESSAGE_SIZE_MB, sBuffer, result)) {
+ maxMsgSizeMB, sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
return sBuffer;
}
@@ -317,7 +317,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
WebFieldDef.MAXMSGSIZEINMB, false,
(isAddOp ? defMaxMsgSizeMB : TBaseConstants.META_VALUE_UNDEFINED),
TBaseConstants.META_MIN_ALLOWED_MESSAGE_SIZE_MB,
- TBaseConstants.META_MAX_ALLOWED_MESSAGE_SIZE_MB, sBuffer, result)) {
+ defMaxMsgSizeMB, sBuffer, result)) {
return result.isSuccess();
}
final int itemMaxMsgSizeMB = (int) result.getRetData();