Просмотр исходного кода

Merge pull request #14296 from terry-xiaoyu/update-ecpool-vsn

chore: update ecpool to 0.5.12
Xinyu Liu 1 год назад
Родитель
Сommit
8b104a22a0
4 измененных файлов с 6 добавлено и 6 удалено
  1. 3 4
      apps/emqx_resource/src/emqx_resource_pool.erl
  2. 1 0
      changes/ce/fix-14296.en.md
  3. 1 1
      mix.exs
  4. 1 1
      rebar.config

+ 3 - 4
apps/emqx_resource/src/emqx_resource_pool.erl

@@ -121,10 +121,9 @@ health_check_workers(PoolName, CheckFunc, Timeout, Opts) ->
             end
     end.
 
-parse_reason({
-    {shutdown, {failed_to_start_child, _, {shutdown, {failed_to_start_child, _, Reason}}}},
-    _
-}) ->
+parse_reason({worker_start_failed, Reason}) ->
+    Reason;
+parse_reason({worker_exit, Reason}) ->
     Reason;
 parse_reason(Reason) ->
     Reason.

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

@@ -0,0 +1 @@
+Avoid `ecpool_sup` being blocked by a very slow-starting `ecpool_worker`.

+ 1 - 1
mix.exs

@@ -206,7 +206,7 @@ defmodule EMQXUmbrella.MixProject do
 
   def common_dep(:cowboy), do: {:cowboy, github: "emqx/cowboy", tag: "2.9.2", override: true}
   def common_dep(:jsone), do: {:jsone, github: "emqx/jsone", tag: "1.7.1", override: true}
-  def common_dep(:ecpool), do: {:ecpool, github: "emqx/ecpool", tag: "0.5.10", override: true}
+  def common_dep(:ecpool), do: {:ecpool, github: "emqx/ecpool", tag: "0.5.12", override: true}
   def common_dep(:replayq), do: {:replayq, github: "emqx/replayq", tag: "0.3.10", override: true}
   def common_dep(:jsx), do: {:jsx, github: "talentdeficit/jsx", tag: "v3.1.0", override: true}
   # in conflict by emqtt and hocon

+ 1 - 1
rebar.config

@@ -87,7 +87,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"}}},
-    {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.10"}}},
+    {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.12"}}},
     {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.10"}}},
     {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
     {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.13.5"}}},