CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.kafka_consumer): Fix deadlock (#16074)

This commit is contained in:
Paweł Żak 2024-10-24 20:34:56 +02:00 committed by GitHub
parent f06111499e
commit 662607cb6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/inputs/kafka_consumer/kafka_consumer.go
View File

@ -64,7 +64,6 @@ type KafkaConsumer struct {
topicClient sarama.Client topicClient sarama.Client
regexps []regexp.Regexp regexps []regexp.Regexp
allWantedTopics []string allWantedTopics []string
ticker *time.Ticker
fingerprint string fingerprint string
parser telegraf.Parser parser telegraf.Parser
@ -376,15 +375,13 @@ func (k *KafkaConsumer) Gather(_ telegraf.Accumulator) error {
} }
func (k *KafkaConsumer) Stop() { func (k *KafkaConsumer) Stop() {
if k.ticker != nil {
k.ticker.Stop()
}
// Lock so that a topic refresh cannot start while we are stopping. // Lock so that a topic refresh cannot start while we are stopping.
k.topicLock.Lock() k.topicLock.Lock()
defer k.topicLock.Unlock()
if k.topicClient != nil { if k.topicClient != nil {
k.topicClient.Close() k.topicClient.Close()
} }
k.topicLock.Unlock()
k.cancel() k.cancel()
k.wg.Wait() k.wg.Wait()
} }