Selaa lähdekoodia

Kafka API timeout fixes + doc (#1187)

*  kafka.admin-client-timeout set to 30s by default
* unused zookeeper.connection-timeout removed
* documentation to admin-client-timeout param added
Ilya Kuramshin 3 vuotta sitten
vanhempi
commit
c9811e4f60

+ 5 - 4
README.md

@@ -162,7 +162,11 @@ For example, if you want to use an environment variable to set the `name` parame
 
 
 |Name               	|Description
 |Name               	|Description
 |-----------------------|-------------------------------
 |-----------------------|-------------------------------
-|`SERVER_SERVLET_CONTEXT_PATH` | URI basePath
+|`SERVER_SERVLET_CONTEXT_PATH`  | URI basePath
+|`LOGGING_LEVEL_ROOT`        	| Setting log level (trace, debug, info, warn, error, fatal, off). Default: debug
+|`LOGGING_LEVEL_COM_PROVECTUS`  |Setting log level (trace, debug, info, warn, error, fatal, off). Default: debug
+|`SERVER_PORT` |Port for the embedded server. Default: `8080`
+|`KAFKA_ADMIN-CLIENT-TIMEOUT` | Kafka API timeout in ms. Default: `30000`
 |`KAFKA_CLUSTERS_0_NAME` | Cluster name
 |`KAFKA_CLUSTERS_0_NAME` | Cluster name
 |`KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS` 	|Address where to connect 
 |`KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS` 	|Address where to connect 
 |`KAFKA_CLUSTERS_0_ZOOKEEPER` 	| Zookeeper service address 
 |`KAFKA_CLUSTERS_0_ZOOKEEPER` 	| Zookeeper service address 
@@ -177,9 +181,6 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_DISABLELOGDIRSCOLLECTION`        	|Disable collecting segments information. It should be true for confluent cloud. Default: false
 |`KAFKA_CLUSTERS_0_DISABLELOGDIRSCOLLECTION`        	|Disable collecting segments information. It should be true for confluent cloud. Default: false
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint 
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint 
-|`LOGGING_LEVEL_ROOT`        	| Setting log level (trace, debug, info, warn, error, fatal, off). Default: debug
-|`LOGGING_LEVEL_COM_PROVECTUS`        	|Setting log level (trace, debug, info, warn, error, fatal, off). Default: debug
-|`SERVER_PORT` |Port for the embedded server. Default `8080`
 |`KAFKA_CLUSTERS_0_JMXSSL` |Enable SSL for JMX? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
 |`KAFKA_CLUSTERS_0_JMXSSL` |Enable SSL for JMX? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
 |`KAFKA_CLUSTERS_0_JMXUSERNAME` |Username for JMX authentication
 |`KAFKA_CLUSTERS_0_JMXUSERNAME` |Username for JMX authentication
 |`KAFKA_CLUSTERS_0_JMXPASSWORD` |Password for JMX authentication
 |`KAFKA_CLUSTERS_0_JMXPASSWORD` |Password for JMX authentication

+ 1 - 1
kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java

@@ -20,7 +20,7 @@ import reactor.core.publisher.Mono;
 public class AdminClientServiceImpl implements AdminClientService, Closeable {
 public class AdminClientServiceImpl implements AdminClientService, Closeable {
   private final Map<String, ReactiveAdminClient> adminClientCache = new ConcurrentHashMap<>();
   private final Map<String, ReactiveAdminClient> adminClientCache = new ConcurrentHashMap<>();
   @Setter // used in tests
   @Setter // used in tests
-  @Value("${kafka.admin-client-timeout}")
+  @Value("${kafka.admin-client-timeout:30000}")
   private int clientTimeout;
   private int clientTimeout;
 
 
   @Override
   @Override

+ 0 - 3
kafka-ui-api/src/main/resources/application-local.yml

@@ -27,9 +27,6 @@ kafka:
   #      protobufMessageNameByTopic:
   #      protobufMessageNameByTopic:
   #        input-topic: InputMessage
   #        input-topic: InputMessage
   #        output-topic: OutputMessage
   #        output-topic: OutputMessage
-  admin-client-timeout: 5000
-zookeeper:
-  connection-timeout: 1000
 spring:
 spring:
   jmx:
   jmx:
     enabled: true
     enabled: true

+ 0 - 3
kafka-ui-api/src/main/resources/application-sdp.yml

@@ -11,6 +11,3 @@ kafka:
   #      zookeeper: zookeeper1:2181
   #      zookeeper: zookeeper1:2181
   #      bootstrapServers: kafka1:29092
   #      bootstrapServers: kafka1:29092
   #      schemaRegistry: http://schemaregistry1:8085
   #      schemaRegistry: http://schemaregistry1:8085
-  admin-client-timeout: 5000
-zookeeper:
-  connection-timeout: 1000

+ 1 - 5
kafka-ui-api/src/main/resources/application.yml

@@ -1,7 +1,3 @@
-kafka:
-  admin-client-timeout: 5000
-zookeeper:
-  connection-timeout: 1000
 auth:
 auth:
   enabled: false
   enabled: false
 management:
 management:
@@ -13,4 +9,4 @@ management:
   endpoints:
   endpoints:
     web:
     web:
       exposure:
       exposure:
-        include: "info,health"
+        include: "info,health"

+ 0 - 3
kafka-ui-api/src/test/resources/application-test.yml

@@ -6,9 +6,6 @@ kafka:
       zookeeper: localhost:2181
       zookeeper: localhost:2181
       schemaRegistry: http://localhost:8081
       schemaRegistry: http://localhost:8081
       jmxPort: 9997
       jmxPort: 9997
-  admin-client-timeout: 5000
-zookeeper:
-  connection-timeout: 1000
 spring:
 spring:
   jmx:
   jmx:
     enabled: true
     enabled: true