Skip to content

Commit

Permalink
Merge pull request #1578 from antsbean/master
Browse files Browse the repository at this point in the history
fixed ConsumerGroup flooding logs with client/metadata update req #1544
  • Loading branch information
d1egoaz authored Jan 22, 2020
2 parents ab4036c + 0cce202 commit 2ead77f
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions consumer_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ func (c *consumerGroup) Consume(ctx context.Context, topics []string, handler Co

// loop check topic partition numbers changed
// will trigger rebalance when any topic partitions number had changed
// avoid Consume function called again that will generate more than loopCheckPartitionNumbers coroutine
go c.loopCheckPartitionNumbers(topics, sess)

// Wait for session exit signal
Expand Down Expand Up @@ -448,7 +449,7 @@ func (c *consumerGroup) handleError(err error, topic string, partition int32) {
}

func (c *consumerGroup) loopCheckPartitionNumbers(topics []string, session *consumerGroupSession) {
pause := time.NewTicker(c.config.Consumer.Group.Heartbeat.Interval * 2)
pause := time.NewTicker(c.config.Metadata.RefreshFrequency)
defer session.cancel()
defer pause.Stop()
var oldTopicToPartitionNum map[string]int
Expand All @@ -468,17 +469,17 @@ func (c *consumerGroup) loopCheckPartitionNumbers(topics []string, session *cons
}
select {
case <-pause.C:
case <-session.ctx.Done():
Logger.Printf("loop check partition number coroutine will exit, topics %s", topics)
// if session closed by other, should be exited
return
case <-c.closed:
return
}
}
}

func (c *consumerGroup) topicToPartitionNumbers(topics []string) (map[string]int, error) {
if err := c.client.RefreshMetadata(topics...); err != nil {
Logger.Printf("Consumer Group refresh metadata failed %v", err)
return nil, err
}
topicToPartitionNum := make(map[string]int, len(topics))
for _, topic := range topics {
if partitionNum, err := c.client.Partitions(topic); err != nil {
Expand Down

0 comments on commit 2ead77f

Please sign in to comment.