Ver código fonte

Merge pull request #14037 from keynslug/fix/EMQX-13309/bump-mria

fix(cluster): ensure join succeeds if cluster goes offline in the process
Andrew Mayorov 1 ano atrás
pai
commit
43d59d1e63
4 arquivos alterados com 4 adições e 3 exclusões
  1. 1 1
      apps/emqx/rebar.config
  2. 1 0
      changes/ce/fix-14037.en.md
  3. 1 1
      mix.exs
  4. 1 1
      rebar.config

+ 1 - 1
apps/emqx/rebar.config

@@ -29,7 +29,7 @@
     {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}},
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.12.0"}}},
-    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.19.6"}}},
+    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.19.7"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.4.1"}}},
     {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.43.4"}}},
     {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.3"}}},

+ 1 - 0
changes/ce/fix-14037.en.md

@@ -0,0 +1 @@
+Ensure the internal database bootstrap process better tolerates transient peer nodes unavailability, especially when a new node joins existing cluster.

+ 1 - 1
mix.exs

@@ -182,7 +182,7 @@ defmodule EMQXUmbrella.MixProject do
     end
   end
 
-  def common_dep(:ekka), do: {:ekka, github: "emqx/ekka", tag: "0.19.6", override: true}
+  def common_dep(:ekka), do: {:ekka, github: "emqx/ekka", tag: "0.19.7", override: true}
   def common_dep(:esockd), do: {:esockd, github: "emqx/esockd", tag: "5.12.0", override: true}
   def common_dep(:gproc), do: {:gproc, github: "emqx/gproc", tag: "0.9.0.1", override: true}
   def common_dep(:hocon), do: {:hocon, github: "emqx/hocon", tag: "0.43.4", override: true}

+ 1 - 1
rebar.config

@@ -83,7 +83,7 @@
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.12.0"}}},
     {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.8.0-emqx-6"}}},
-    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.19.6"}}},
+    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.19.7"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.4.1"}}},
     {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.12"}}},
     {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.4.4"}}},