You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/08/10 11:21:47 UTC
[inlong] branch master updated: [INLONG-5419][Manager][Dashboard] Fix the Pulsar creates a specified queue model's error (#5420)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 21b740367 [INLONG-5419][Manager][Dashboard] Fix the Pulsar creates a specified queue model's error (#5420)
21b740367 is described below
commit 21b740367ede1e8af1b8b0612a8c9bccfdc4b3d8
Author: ganfengtan <Ga...@users.noreply.github.com>
AuthorDate: Wed Aug 10 19:21:42 2022 +0800
[INLONG-5419][Manager][Dashboard] Fix the Pulsar creates a specified queue model's error (#5420)
---
.../src/components/AccessHelper/FieldsConfig/businessFields.tsx | 8 ++++----
.../java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java | 6 +++---
.../manager-client-tools/src/test/resources/create_group.json | 2 +-
.../inlong/manager/client/api/impl/InlongGroupImplTest.java | 2 +-
.../apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java | 2 +-
.../inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx b/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
index 2a9dbd83b..c27857009 100644
--- a/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
+++ b/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
@@ -104,17 +104,17 @@ export default (
type: 'radio',
label: i18n.t('components.AccessHelper.FieldsConfig.businessFields.QueueModule'),
name: 'queueModule',
- initialValue: currentValues.queueModule ?? 'serial',
+ initialValue: currentValues.queueModule ?? 'SERIAL',
rules: [{ required: true }],
props: {
options: [
{
label: i18n.t('components.AccessHelper.FieldsConfig.businessFields.Parallel'),
- value: 'parallel',
+ value: 'PARALLEL',
},
{
label: i18n.t('components.AccessHelper.FieldsConfig.businessFields.Serial'),
- value: 'serial',
+ value: 'SERIAL',
},
],
},
@@ -131,7 +131,7 @@ export default (
max: 20,
precision: 0,
},
- visible: values => values.mqType === 'PULSAR' && values.queueModule === 'parallel',
+ visible: values => values.mqType === 'PULSAR' && values.queueModule === 'PARALLEL',
},
{
type: 'inputnumber',
diff --git a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
index d715956a2..b60b05bd7 100644
--- a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
+++ b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
@@ -130,7 +130,7 @@ class Kafka2HiveTest extends BaseTest {
+ "\"creator\":\"admin\",\"modifier\":\"admin\","
+ "\"createTime\":\"2022-06-06 09:59:10\","
+ "\"modifyTime\":\"2022-06-06 02:24:50\",\"extList\":[],\"tenant\":null,"
- + "\"adminUrl\":null,\"serviceUrl\":null,\"queueModule\":\"parallel\","
+ + "\"adminUrl\":null,\"serviceUrl\":null,\"queueModule\":\"PARALLEL\","
+ "\"partitionNum\":3,\"ensemble\":3,\"writeQuorum\":3,\"ackQuorum\":2,"
+ "\"ttl\":24,\"ttlUnit\":\"hours\",\"retentionTime\":72,"
+ "\"retentionTimeUnit\":\"hours\",\"retentionSize\":-1,"
@@ -187,7 +187,7 @@ class Kafka2HiveTest extends BaseTest {
+ "\"status\":101,\"creator\":\"admin\",\"modifier\":\"admin\","
+ "\"createTime\":\"2022-06-06 16:36:35\",\"modifyTime\":\"2022-06-06 08:37:04\","
+ "\"extList\":[],\"tenant\":null,\"adminUrl\":null,\"serviceUrl\":null,"
- + "\"queueModule\":\"parallel\",\"partitionNum\":3,\"ensemble\":3,\"writeQuorum\":3,"
+ + "\"queueModule\":\"PARALLEL\",\"partitionNum\":3,\"ensemble\":3,\"writeQuorum\":3,"
+ "\"ackQuorum\":2,\"ttl\":24,\"ttlUnit\":\"hours\",\"retentionTime\":72,"
+ "\"retentionTimeUnit\":\"hours\",\"retentionSize\":-1,\"retentionSizeUnit\":\"MB\"},"
+ "\"streamInfoList\":[{\"id\":8,\"inlongGroupId\":\"test_group011\","
@@ -230,7 +230,7 @@ class Kafka2HiveTest extends BaseTest {
.createTime(new Date())
.modifyTime(new Date())
.extList(new ArrayList<>())
- .queueModule("parallel")
+ .queueModule("PARALLEL")
.partitionNum(3)
.ensemble(3)
.writeQuorum(3)
diff --git a/inlong-manager/manager-client-tools/src/test/resources/create_group.json b/inlong-manager/manager-client-tools/src/test/resources/create_group.json
index 88809ea1a..e91ed573c 100644
--- a/inlong-manager/manager-client-tools/src/test/resources/create_group.json
+++ b/inlong-manager/manager-client-tools/src/test/resources/create_group.json
@@ -4,7 +4,7 @@
"inlongGroupId": "test_group",
"name": "test_name",
"inCharges": "admin",
- "queueModule": "serial",
+ "queueModule": "SERIAL",
"writeQuorum": 1,
"ackQuorum": 1,
"ttl": 24,
diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
index 3ae87c673..7d6741394 100644
--- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
+++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
@@ -58,7 +58,7 @@ class InlongGroupImplTest {
+ " \"tenant\" : null,\n"
+ " \"adminUrl\" : null,\n"
+ " \"serviceUrl\" : null,\n"
- + " \"queueModule\" : \"parallel\",\n"
+ + " \"queueModule\" : \"PARALLEL\",\n"
+ " \"partitionNum\" : 3,\n"
+ " \"ensemble\" : 3,\n"
+ " \"writeQuorum\" : 3,\n"
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java
index 9e3ee034c..cf54ef448 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java
@@ -52,7 +52,7 @@ public class InlongPulsarInfo extends InlongGroupInfo {
@ApiModelProperty(value = "Queue model, parallel: multiple partitions, high throughput, out-of-order messages;"
+ "serial: single partition, low throughput, and orderly messages")
- private String queueModule = "parallel";
+ private String queueModule = "PARALLEL";
@ApiModelProperty("The number of partitions of Topic, 1-20")
private int partitionNum = 3;
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java
index e6279fda7..851a63baa 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java
@@ -38,7 +38,7 @@ public class InlongPulsarRequest extends InlongGroupRequest {
@ApiModelProperty(value = "Queue model, parallel: multiple partitions, high throughput, out-of-order messages;"
+ "serial: single partition, low throughput, and orderly messages")
- private String queueModule = "parallel";
+ private String queueModule = "PARALLEL";
@ApiModelProperty(value = "Number of partitions of Topic, 1-20")
private Integer partitionNum = 3;