From a91b66904838a1d8ff08520c98dc33c441c705ed Mon Sep 17 00:00:00 2001 From: wathenjiang Date: Fri, 30 Sep 2022 14:54:08 +0800 Subject: [PATCH 1/2] for config backward compatibility --- config.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.go b/config.go index c3918ecfd..f994a11df 100644 --- a/config.go +++ b/config.go @@ -794,6 +794,12 @@ func (c *Config) Validate() error { return ConfigurationError("ReadCommitted requires Version >= V0_11_0_0") } + // backward compatibility on Rebalance Strategy + if c.Consumer.Group.Rebalance.Strategy != nil { + // avoid Consumer.Group.Rebalance.GroupStrategies and Consumer.Group.Rebalance.Strategy being set at the same time + c.Consumer.Group.Rebalance.GroupStrategies = []BalanceStrategy{} + } + // validate the Consumer Group values switch { case c.Consumer.Group.Session.Timeout <= 2*time.Millisecond: @@ -804,8 +810,6 @@ func (c *Config) Validate() error { return ConfigurationError("Consumer.Group.Heartbeat.Interval must be < Consumer.Group.Session.Timeout") case c.Consumer.Group.Rebalance.Strategy == nil && len(c.Consumer.Group.Rebalance.GroupStrategies) == 0: return ConfigurationError("Consumer.Group.Rebalance.GroupStrategies or Consumer.Group.Rebalance.Strategy must not be empty") - case c.Consumer.Group.Rebalance.Strategy != nil && len(c.Consumer.Group.Rebalance.GroupStrategies) != 0: - return ConfigurationError("Consumer.Group.Rebalance.GroupStrategies and Consumer.Group.Rebalance.Strategy cannot be set at the same time") case c.Consumer.Group.Rebalance.Timeout <= time.Millisecond: return ConfigurationError("Consumer.Group.Rebalance.Timeout must be >= 1ms") case c.Consumer.Group.Rebalance.Retry.Max < 0: From 97f3cd1c81e65afac89a98906d6b960411c8ea77 Mon Sep 17 00:00:00 2001 From: wathenjiang Date: Fri, 30 Sep 2022 16:45:35 +0800 Subject: [PATCH 2/2] keep no editing in volidation method --- config.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config.go b/config.go index f994a11df..b07034434 100644 --- a/config.go +++ b/config.go @@ -794,12 +794,6 @@ func (c *Config) Validate() error { return ConfigurationError("ReadCommitted requires Version >= V0_11_0_0") } - // backward compatibility on Rebalance Strategy - if c.Consumer.Group.Rebalance.Strategy != nil { - // avoid Consumer.Group.Rebalance.GroupStrategies and Consumer.Group.Rebalance.Strategy being set at the same time - c.Consumer.Group.Rebalance.GroupStrategies = []BalanceStrategy{} - } - // validate the Consumer Group values switch { case c.Consumer.Group.Session.Timeout <= 2*time.Millisecond: