From eaf1def9262590b03747d463eb4e5cb287945c4d Mon Sep 17 00:00:00 2001 From: wjjiang Date: Mon, 3 Oct 2022 20:52:13 +0800 Subject: [PATCH] fix: support existing deprecated Rebalance.Strategy field usage (#2352) * for config backward compatibility remove the validation that prevented both fields being set and instead rely on precedence which favours the legacy field currently --- config.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.go b/config.go index c3918ecfd..b07034434 100644 --- a/config.go +++ b/config.go @@ -804,8 +804,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: