0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix zookeeper thread leaking (#1574)

Browse source 
* Issue #1472 Added protection to prevent infinite loops when connection is in error with zookeeper

* Issue #1472 Added protection to prevent infinite loops when connection is in error with zookeeper

* Issue #1472 Added protection to prevent infinite loops when connection is in error with zookeeper

* Issue #1472 corrected checkStyle error

* Issue #1472 corrected bug

* Get rid of a successful test

this will always fail since it's not an integration test

* Fix test

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
This commit is contained in:
Mohamad Choukair 2022-03-10 06:13:39 -05:00 • committed by GitHub
parent 5601fe85ac
commit f3c07b15e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ZookeeperService.java
View file

@ -56,6 +56,7 @@ public class ZookeeperService {
zkClient.getChildren("/brokers/ids", null);
} catch (KeeperException e) {
log.error("A zookeeper exception has occurred", e);
closeZkClientSession(zkClient, e);
return false;
} catch (InterruptedException e) {
log.error("Interrupted: ", e);
@ -64,6 +65,15 @@ public class ZookeeperService {
return true;
}
private void closeZkClientSession(ZooKeeper zkClient, KeeperException e) {
try {
zkClient.close();
} catch (InterruptedException ex) {
log.error("Unable to close zkClient session: ", e);
Thread.currentThread().interrupt();
}
}
@Nullable
private ZooKeeper getOrCreateZkClient(KafkaCluster cluster) {
final var clusterName = cluster.getName();

52
kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ZookeeperServiceTest.java Normal file
View file

@ -0,0 +1,52 @@
package com.provectus.kafka.ui.service;
import com.provectus.kafka.ui.AbstractIntegrationTest;
import com.provectus.kafka.ui.model.KafkaCluster;
import com.provectus.kafka.ui.model.ServerStatusDTO;
import java.util.Properties;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import reactor.test.StepVerifier;
class ZookeeperServiceTest extends AbstractIntegrationTest {
private ZookeeperService zookeeperService;
@BeforeEach
void init() {
AdminClientServiceImpl adminClientService = new AdminClientServiceImpl();
adminClientService.setClientTimeout(5_000);
zookeeperService = new ZookeeperService();
}
@Test
void getZkStatusEmptyConfig() {
KafkaCluster kafkaCluster =
KafkaCluster.builder()
.name(LOCAL)
.bootstrapServers(kafka.getBootstrapServers())
.properties(new Properties())
.build();
ZookeeperService.ZkStatus zkStatus = new ZookeeperService.ZkStatus(ServerStatusDTO.OFFLINE, null);
StepVerifier.create(zookeeperService.getZkStatus(kafkaCluster))
.expectNext(zkStatus)
.verifyComplete();
}
@Test
void getZkStatusWrongConfig() {
KafkaCluster kafkaCluster =
KafkaCluster.builder()
.name(LOCAL)
.bootstrapServers(kafka.getBootstrapServers())
.zookeeper("localhost:1000")
.properties(new Properties())
.build();
ZookeeperService.ZkStatus zkStatus = new ZookeeperService.ZkStatus(ServerStatusDTO.OFFLINE, null);
StepVerifier.create(zookeeperService.getZkStatus(kafkaCluster))
.expectNext(zkStatus)
.verifyComplete();
}
}