Backend topics changing #44

yazebochan · 2020-04-28T13:13:19Z

No description provided.

* starting refactor mono * topics and cluster refactored into mono way instead of get * fixed dirty mistakes * param * changed collecttopicdata method to correctly * refactored metrics to copyonwrite methoology * metrics params updated * fixed silly mistake * Let's think immutable * immutable * dumb mistakes fixed * changed to immutable * added new mappers * changed to immutable * typo was fixed * imports were cleared * Refactored * imports were optimized Co-authored-by: Roman Nedzvetskiy <[email protected]> Co-authored-by: German Osin <[email protected]>

* issue-31/add-ui-prefix-for-react-routes * added route for /ui path (#40) Co-authored-by: Roman Nedzvetskiy <[email protected]> Co-authored-by: Roman Nedzvetskiy <[email protected]> Co-authored-by: Roman Nedzvetskiy <[email protected]>

* fix-bug-topic-not-creatable-when-no-custom-params * remove-linter-changes-to-cleanup-PR

* enhancement/improve-time-to-retain-usability * add-btn-controls-for-time-to-retain-for-topics

germanosin · 2020-04-28T13:14:33Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java

@@ -62,6 +63,14 @@
        return kafkaService.createTopic(cluster, topicFormData);
    }

+    public Mono<ResponseEntity<Topic>> updateTopic(String clusterName, String topicName, Mono<TopicFormData> topicFormData) {
+        KafkaCluster cluster = clustersStorage.getClusterByName(clusterName);
+        if (cluster == null) return null;


This is bad idea

changed to return Mono.error

germanosin · 2020-04-28T13:14:52Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java

+    public Mono<ResponseEntity<Topic>> updateTopic(String clusterName, String topicName, Mono<TopicFormData> topicFormData) {
+        KafkaCluster cluster = clustersStorage.getClusterByName(clusterName);
+        if (cluster == null) return null;
+        return ClusterUtil.toMono(cluster.getAdminClient().describeCluster().controller())


We talked to move this logic outside

moved to controller level

germanosin · 2020-04-28T13:15:30Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

@@ -72,6 +77,27 @@ public void loadClusterMetrics(KafkaCluster kafkaCluster) {
        );
    }

+    public Mono<Topic> updateTopic(KafkaCluster cluster, String topicName, TopicFormData topicFormData, Integer id) {
+        ConfigResource topicCR = new ConfigResource(ConfigResource.Type.TOPIC, topicName);


Please refactor it

germanosin · 2020-04-28T13:16:28Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

+        List<ConfigResource> brokerCR = Collections.singletonList(new ConfigResource(ConfigResource.Type.BROKER, id.toString()));
+        return ClusterUtil.toMono(cluster.getAdminClient().describeConfigs(brokerCR).all())
+                .flatMap(c -> {
+                    if (oldClusterVersion(c, cluster)) {


we could cache cluster version on adminclient cache level.

cluster supported commands enum added to KafkaCluster object

germanosin · 2020-04-28T13:16:51Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/zookeeper/ZooKeeperConstants.java

@@ -7,4 +7,7 @@ private ZooKeeperConstants() {}
    public static int ONLINE = 1;
    public static int OFFLINE = 0;

+    public static int CONNECTION_TIMEOUT_MS = 1000;


move to config

germanosin · 2020-04-28T13:17:26Z

kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml

@@ -141,6 +141,34 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/TopicDetails'
+    patch:


Why not PUT?

changed to put

…r topics settings update, changed request version from patch to put

germanosin · 2020-04-30T10:53:05Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/util/ClusterUtil.java

@@ -31,4 +39,22 @@ public static ConsumerGroup convertToConsumerGroup(ConsumerGroupDescription c, K
        consumerGroup.setNumTopics(topics.size());
        return consumerGroup;
    }
+
+    public static void setSupportedCommands(KafkaCluster cluster, Map<ConfigResource, Config> configs) {


this method should provide immutable list of supported features

germanosin · 2020-04-30T10:54:14Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

+    public Mono<Topic> updateTopic(KafkaCluster cluster, String topicName, TopicFormData topicFormData, Integer id) {
+        ConfigResource topicCR = new ConfigResource(ConfigResource.Type.TOPIC, topicName);
+        List<ConfigResource> brokerCR = Collections.singletonList(new ConfigResource(ConfigResource.Type.BROKER, id.toString()));
+        return ClusterUtil.toMono(cluster.getAdminClient().describeConfigs(brokerCR).all())


You can do it only once on adminclient init

germanosin · 2020-04-30T10:54:46Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

+                        ClusterUtil.setSupportedCommands(cluster, c);
+                    }
+                    if (cluster.getSupportedCommands().contains(SupportedCommands.INCREMENTAL_ALTER_CONFIGS)) {
+                        List<AlterConfigOp> listOp = topicFormData.getConfigs().entrySet().stream()


I'll separate these methods for clear code

germanosin · 2020-04-30T10:55:22Z

kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

+    }
+
+    @SneakyThrows
+    private String getClusterId(KafkaCluster kafkaCluster) {


Blocking method?

…Name

…hod changed -- removed redundant param clusterName

yazebochan and others added 6 commits April 24, 2020 11:15

need to refactor

5d98deb

issue-31/add-ui-prefix-for-react-routes (#34)

5d0b783

* issue-31/add-ui-prefix-for-react-routes * added route for /ui path (#40) Co-authored-by: Roman Nedzvetskiy <[email protected]> Co-authored-by: Roman Nedzvetskiy <[email protected]> Co-authored-by: Roman Nedzvetskiy <[email protected]>

fix-bug-topic-not-creatable-when-no-custom-params (#37)

3c5b46b

* fix-bug-topic-not-creatable-when-no-custom-params * remove-linter-changes-to-cleanup-PR

Enhancement/improve time to retain usability v2 (#35)

2d45c48

* enhancement/improve-time-to-retain-usability * add-btn-controls-for-time-to-retain-for-topics

updating of topic done properly

5e7602b

yazebochan requested review from germanosin and workshur April 28, 2020 13:13

germanosin suggested changes Apr 28, 2020

View reviewed changes

Added supportedCommands enum in cluster for getting correct method fo…

84c905a

…r topics settings update, changed request version from patch to put

germanosin suggested changes Apr 30, 2020

View reviewed changes

Roman Nedzvetskiy and others added 16 commits April 30, 2020 14:45

Merge branch 'master' into backend-topics-changing

3d7ef5b

AdminClient now boxed into extendedAdminClient

9d4fb80

Redundant imports removed

37825b7

SupportedFeatures method moved to util

72830b3

Methods of updating cluster separated

7c47c4d

Subsribed to change topics methods, replaced path of ts class

891b4cf

fix-routes-for-details (#45)

42085b5

Merge branch 'master' into backend-topics-changing

ee16313

Added test and changed getAdminClient logic from clusterId to cluster…

8f4e988

…Name

Changed updating methods mono logic, added update cluster topic method

c7787fa

Fixed test by removing updateCluster calls, fixed add topic

0ba4666

Removed redundant injection and import

a077938

Added behaviour if topic wasn't created

2175243

Removed redundant imports

717b361

Dublicate lines in ClusterService moved to updateCluster method

6ebabed

CreateTopic method updated -- now returns topicName, update topic met…

cc9b773

…hod changed -- removed redundant param clusterName

germanosin approved these changes May 12, 2020

View reviewed changes

yazebochan merged commit 8752bc9 into feature/22-add-editability-for-topics May 12, 2020

workshur deleted the backend-topics-changing branch February 3, 2021 15:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backend topics changing #44

Backend topics changing #44

yazebochan commented Apr 28, 2020

germanosin Apr 28, 2020

yazebochan Apr 30, 2020

germanosin Apr 28, 2020

yazebochan Apr 30, 2020

germanosin Apr 28, 2020

germanosin Apr 28, 2020

yazebochan Apr 30, 2020

germanosin Apr 28, 2020

yazebochan Apr 30, 2020

germanosin Apr 28, 2020

yazebochan Apr 30, 2020

germanosin Apr 30, 2020

germanosin Apr 30, 2020

germanosin Apr 30, 2020

yazebochan May 2, 2020

germanosin Apr 30, 2020

Backend topics changing #44

Backend topics changing #44

Conversation

yazebochan commented Apr 28, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment