From 73fed3face0efa2c9dd69c3e3946741fce2f7e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=99=93=E4=B8=9C?= <763795151@qq.com> Date: Thu, 25 Nov 2021 10:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E9=99=90=E6=B5=81=E9=80=9F?= =?UTF-8?q?=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../console/beans/vo/TopicPartitionVO.java | 4 +- .../controller/OperationController.java | 5 + .../console/service/OperationService.java | 2 + .../service/impl/OperationServiceImpl.java | 6 + .../kafka/console/OperationConsole.scala | 10 ++ ui/src/utils/api.js | 4 + ui/src/views/op/Operation.vue | 18 ++- ui/src/views/op/RemoveThrottle.vue | 127 ++++++++++++++++++ ui/src/views/topic/PartitionInfo.vue | 21 ++- 9 files changed, 182 insertions(+), 15 deletions(-) create mode 100644 ui/src/views/op/RemoveThrottle.vue diff --git a/src/main/java/com/xuxd/kafka/console/beans/vo/TopicPartitionVO.java b/src/main/java/com/xuxd/kafka/console/beans/vo/TopicPartitionVO.java index a8a3f91..c6e8300 100644 --- a/src/main/java/com/xuxd/kafka/console/beans/vo/TopicPartitionVO.java +++ b/src/main/java/com/xuxd/kafka/console/beans/vo/TopicPartitionVO.java @@ -33,8 +33,8 @@ public class TopicPartitionVO { TopicPartitionVO partitionVO = new TopicPartitionVO(); partitionVO.setPartition(partitionInfo.partition()); partitionVO.setLeader(partitionInfo.leader().toString()); - partitionVO.setReplicas(partitionInfo.replicas().stream().map(Node::toString).collect(Collectors.toList())); - partitionVO.setIsr(partitionInfo.isr().stream().map(Node::toString).collect(Collectors.toList())); + partitionVO.setReplicas(partitionInfo.replicas().stream().map(node -> node.host() + ":" + node.port() + " (id: " + node.idString() + ")").collect(Collectors.toList())); + partitionVO.setIsr(partitionInfo.isr().stream().map(Node::idString).collect(Collectors.toList())); return partitionVO; } } diff --git a/src/main/java/com/xuxd/kafka/console/controller/OperationController.java b/src/main/java/com/xuxd/kafka/console/controller/OperationController.java index e4d06f5..b1b83aa 100644 --- a/src/main/java/com/xuxd/kafka/console/controller/OperationController.java +++ b/src/main/java/com/xuxd/kafka/console/controller/OperationController.java @@ -58,4 +58,9 @@ public class OperationController { public Object configThrottle(@RequestBody BrokerThrottleDTO dto) { return operationService.configThrottle(dto.getBrokerList(), dto.getUnit().toKb(dto.getThrottle())); } + + @DeleteMapping("/broker/throttle") + public Object removeThrottle(@RequestBody BrokerThrottleDTO dto) { + return operationService.removeThrottle(dto.getBrokerList()); + } } diff --git a/src/main/java/com/xuxd/kafka/console/service/OperationService.java b/src/main/java/com/xuxd/kafka/console/service/OperationService.java index ef10b2c..e797fd1 100644 --- a/src/main/java/com/xuxd/kafka/console/service/OperationService.java +++ b/src/main/java/com/xuxd/kafka/console/service/OperationService.java @@ -23,4 +23,6 @@ public interface OperationService { ResponseData electPreferredLeader(String topic, int partition); ResponseData configThrottle(List brokerList, long size); + + ResponseData removeThrottle(List brokerList); } diff --git a/src/main/java/com/xuxd/kafka/console/service/impl/OperationServiceImpl.java b/src/main/java/com/xuxd/kafka/console/service/impl/OperationServiceImpl.java index 9ca6850..5898563 100644 --- a/src/main/java/com/xuxd/kafka/console/service/impl/OperationServiceImpl.java +++ b/src/main/java/com/xuxd/kafka/console/service/impl/OperationServiceImpl.java @@ -129,4 +129,10 @@ public class OperationServiceImpl implements OperationService { return (boolean) tuple2._1() ? ResponseData.create().success() : ResponseData.create().failed(tuple2._2()); } + + @Override public ResponseData removeThrottle(List brokerList) { + Tuple2 tuple2 = operationConsole.clearBrokerLevelThrottles(new HashSet<>(brokerList)); + + return (boolean) tuple2._1() ? ResponseData.create().success() : ResponseData.create().failed(tuple2._2()); + } } diff --git a/src/main/scala/kafka/console/OperationConsole.scala b/src/main/scala/kafka/console/OperationConsole.scala index a1d3338..8a192bd 100644 --- a/src/main/scala/kafka/console/OperationConsole.scala +++ b/src/main/scala/kafka/console/OperationConsole.scala @@ -221,4 +221,14 @@ class OperationConsole(config: KafkaConfig, topicConsole: TopicConsole, (false, e.getMessage) }).asInstanceOf[(Boolean, String)] } + + def clearBrokerLevelThrottles(brokers: util.Set[Int]): (Boolean, String) = { + withAdminClientAndCatchError(admin => { + ReassignPartitionsCommand.clearBrokerLevelThrottles(admin, brokers.asScala.toSet) + (true, "") + }, e => { + log.error("clearBrokerLevelThrottles error.", e) + (false, e.getMessage) + }).asInstanceOf[(Boolean, String)] + } } \ No newline at end of file diff --git a/ui/src/utils/api.js b/ui/src/utils/api.js index c0c83e7..f0c9025 100644 --- a/ui/src/utils/api.js +++ b/ui/src/utils/api.js @@ -202,4 +202,8 @@ export const KafkaOpApi = { url: "/op/broker/throttle", method: "post", }, + removeThrottle: { + url: "/op/broker/throttle", + method: "delete", + }, }; diff --git a/ui/src/views/op/Operation.vue b/ui/src/views/op/Operation.vue index dc7b0a7..90fe33e 100644 --- a/ui/src/views/op/Operation.vue +++ b/ui/src/views/op/Operation.vue @@ -12,7 +12,9 @@ >

- 解除限流 + + 解除限流 + 解除指定broker上的topic副本之间数据同步占用的带宽限制

@@ -94,6 +96,11 @@ @closeConfigThrottleDialog="closeConfigThrottleDialog" > + + @@ -104,6 +111,7 @@ import OffsetAlignmentTable from "@/views/op/OffsetAlignmentTable"; import ElectPreferredLeader from "@/views/op/ElectPreferredLeader"; import DataSyncScheme from "@/views/op/DataSyncScheme"; import ConfigThrottle from "@/views/op/ConfigThrottle"; +import RemoveThrottle from "@/views/op/RemoveThrottle"; export default { name: "Operation", components: { @@ -113,6 +121,7 @@ export default { ElectPreferredLeader, DataSyncScheme, ConfigThrottle, + RemoveThrottle, }, data() { return { @@ -127,6 +136,7 @@ export default { }, brokerManager: { showConfigThrottleDialog: false, + showRemoveThrottleDialog: false, }, }; }, @@ -167,6 +177,12 @@ export default { closeConfigThrottleDialog() { this.brokerManager.showConfigThrottleDialog = false; }, + openRemoveThrottleDialog() { + this.brokerManager.showRemoveThrottleDialog = true; + }, + closeRemoveThrottleDialog() { + this.brokerManager.showRemoveThrottleDialog = false; + }, }, }; diff --git a/ui/src/views/op/RemoveThrottle.vue b/ui/src/views/op/RemoveThrottle.vue new file mode 100644 index 0000000..27b190e --- /dev/null +++ b/ui/src/views/op/RemoveThrottle.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/ui/src/views/topic/PartitionInfo.vue b/ui/src/views/topic/PartitionInfo.vue index c28f8c4..3028c1f 100644 --- a/ui/src/views/topic/PartitionInfo.vue +++ b/ui/src/views/topic/PartitionInfo.vue @@ -12,6 +12,7 @@
    -
      - {{ - i - }} -
    -
-
    -
      - {{ - i - }} -
    +
  • + {{ i }} +
+
+ + {{ i }} + +