From 9637b1454329db630b97e5fba60c9d895de3d521 Mon Sep 17 00:00:00 2001 From: zmstone Date: Wed, 22 May 2024 18:09:38 +0200 Subject: [PATCH 1/2] fix: upgrade to brod 3.18.0 to fix unnecessary rebalance --- apps/emqx_bridge_azure_event_hub/rebar.config | 2 +- apps/emqx_bridge_confluent/rebar.config | 2 +- apps/emqx_bridge_kafka/rebar.config | 2 +- changes/ee/fix-13093.en.md | 3 +++ mix.exs | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 changes/ee/fix-13093.en.md diff --git a/apps/emqx_bridge_azure_event_hub/rebar.config b/apps/emqx_bridge_azure_event_hub/rebar.config index 8cd5ee427..5236d9a0e 100644 --- a/apps/emqx_bridge_azure_event_hub/rebar.config +++ b/apps/emqx_bridge_azure_event_hub/rebar.config @@ -5,7 +5,7 @@ {wolff, {git, "https://github.com/kafka4beam/wolff.git", {tag, "1.10.4"}}}, {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.5"}}}, {brod_gssapi, {git, "https://github.com/kafka4beam/brod_gssapi.git", {tag, "v0.1.1"}}}, - {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.16.8"}}}, + {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.18.0"}}}, {snappyer, "1.2.9"}, {emqx_connector, {path, "../../apps/emqx_connector"}}, {emqx_resource, {path, "../../apps/emqx_resource"}}, diff --git a/apps/emqx_bridge_confluent/rebar.config b/apps/emqx_bridge_confluent/rebar.config index a969ac83b..a3997ada7 100644 --- a/apps/emqx_bridge_confluent/rebar.config +++ b/apps/emqx_bridge_confluent/rebar.config @@ -5,7 +5,7 @@ {wolff, {git, "https://github.com/kafka4beam/wolff.git", {tag, "1.10.4"}}}, {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.5"}}}, {brod_gssapi, {git, "https://github.com/kafka4beam/brod_gssapi.git", {tag, "v0.1.1"}}}, - {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.16.8"}}}, + {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.18.0"}}}, {snappyer, "1.2.9"}, {emqx_connector, {path, "../../apps/emqx_connector"}}, {emqx_resource, {path, "../../apps/emqx_resource"}}, diff --git a/apps/emqx_bridge_kafka/rebar.config b/apps/emqx_bridge_kafka/rebar.config index fd7f03da8..78569b321 100644 --- a/apps/emqx_bridge_kafka/rebar.config +++ b/apps/emqx_bridge_kafka/rebar.config @@ -5,7 +5,7 @@ {wolff, {git, "https://github.com/kafka4beam/wolff.git", {tag, "1.10.4"}}}, {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.5"}}}, {brod_gssapi, {git, "https://github.com/kafka4beam/brod_gssapi.git", {tag, "v0.1.1"}}}, - {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.16.8"}}}, + {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.18.0"}}}, {snappyer, "1.2.9"}, {emqx_connector, {path, "../../apps/emqx_connector"}}, {emqx_resource, {path, "../../apps/emqx_resource"}}, diff --git a/changes/ee/fix-13093.en.md b/changes/ee/fix-13093.en.md new file mode 100644 index 000000000..ebae132f1 --- /dev/null +++ b/changes/ee/fix-13093.en.md @@ -0,0 +1,3 @@ +Improve Kafka consumer group stability. + +Prior to this change, Kafka consumer group sometimes may need to rebalance twice after Kafka group coordinator restart. diff --git a/mix.exs b/mix.exs index e39fa6dd4..e742a065a 100644 --- a/mix.exs +++ b/mix.exs @@ -213,7 +213,7 @@ defmodule EMQXUmbrella.MixProject do {:wolff, github: "kafka4beam/wolff", tag: "1.10.4"}, {:kafka_protocol, github: "kafka4beam/kafka_protocol", tag: "4.1.5", override: true}, {:brod_gssapi, github: "kafka4beam/brod_gssapi", tag: "v0.1.1"}, - {:brod, github: "kafka4beam/brod", tag: "3.16.8"}, + {:brod, github: "kafka4beam/brod", tag: "3.18.0"}, {:snappyer, "1.2.9", override: true}, {:crc32cer, "0.1.8", override: true}, {:opentsdb, github: "emqx/opentsdb-client-erl", tag: "v0.5.1", override: true}, From 8d7417d51c48ae2ba8348f45d37853b3964f2fe4 Mon Sep 17 00:00:00 2001 From: zmstone Date: Sun, 2 Jun 2024 10:10:17 +0200 Subject: [PATCH 2/2] chore: stop pinning supervisor in mix.exs --- mix.exs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mix.exs b/mix.exs index e742a065a..5432b64ae 100644 --- a/mix.exs +++ b/mix.exs @@ -102,8 +102,7 @@ defmodule EMQXUmbrella.MixProject do {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true}, {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true}, {:ra, "2.7.3", override: true}, - {:mimerl, "1.2.0", override: true}, - {:supervisor3, "1.1.12", override: true} + {:mimerl, "1.2.0", override: true} ] ++ emqx_apps(profile_info, version) ++ enterprise_deps(profile_info) ++ jq_dep() ++ quicer_dep()