Browse Source
Merge pull request #11419 from thingsboard/fix/kafka-unknown-session-timeout-ms
Fix unrecognized Kafka config 'session.timeout.ms'
pull/11458/head
Viacheslav Klimov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
1 additions and
3 deletions
-
common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaSettings.java
-
common/queue/src/test/java/org/thingsboard/server/queue/kafka/TbKafkaSettingsTest.java
|
|
|
@ -151,6 +151,7 @@ public class TbKafkaSettings { |
|
|
|
Properties props = toProps(); |
|
|
|
props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, servers); |
|
|
|
props.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, maxPollRecords); |
|
|
|
props.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, sessionTimeoutMs); |
|
|
|
props.put(ConsumerConfig.MAX_PARTITION_FETCH_BYTES_CONFIG, maxPartitionFetchBytes); |
|
|
|
props.put(ConsumerConfig.FETCH_MAX_BYTES_CONFIG, fetchMaxBytes); |
|
|
|
props.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG, maxPollIntervalMs); |
|
|
|
@ -193,8 +194,6 @@ public class TbKafkaSettings { |
|
|
|
} |
|
|
|
|
|
|
|
props.put(CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG, requestTimeoutMs); |
|
|
|
props.put(CommonClientConfigs.SESSION_TIMEOUT_MS_CONFIG, sessionTimeoutMs); |
|
|
|
|
|
|
|
props.putAll(PropertyUtils.getProps(otherInline)); |
|
|
|
|
|
|
|
if (other != null) { |
|
|
|
|
|
|
|
@ -49,7 +49,6 @@ class TbKafkaSettingsTest { |
|
|
|
Properties props = settings.toProps(); |
|
|
|
|
|
|
|
assertThat(props).as("TB_QUEUE_KAFKA_REQUEST_TIMEOUT_MS").containsEntry("request.timeout.ms", 30000); |
|
|
|
assertThat(props).as("TB_QUEUE_KAFKA_SESSION_TIMEOUT_MS").containsEntry("session.timeout.ms", 10000); |
|
|
|
|
|
|
|
//other-inline
|
|
|
|
assertThat(props).as("metrics.recording.level").containsEntry("metrics.recording.level", "INFO"); |
|
|
|
|