Gun Connection Pool: successfully retry after reclaiming the pool

This commit is contained in:
Mark Felder 2024-06-20 14:03:22 -04:00
parent 1071632a50
commit c765fcbe7e
3 changed files with 22 additions and 12 deletions

View File

@ -0,0 +1 @@
Gun Connection Pool was not retrying to acquire a connection if the pool was full and stale connections were reclaimed

View File

@ -5,6 +5,9 @@
defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do
@moduledoc "Supervisor for pool workers. Does not do anything except enforce max connection limit" @moduledoc "Supervisor for pool workers. Does not do anything except enforce max connection limit"
alias Pleroma.Config
alias Pleroma.Gun.ConnectionPool.Worker
use DynamicSupervisor use DynamicSupervisor
def start_link(opts) do def start_link(opts) do
@ -14,21 +17,28 @@ defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do
def init(_opts) do def init(_opts) do
DynamicSupervisor.init( DynamicSupervisor.init(
strategy: :one_for_one, strategy: :one_for_one,
max_children: Pleroma.Config.get([:connections_pool, :max_connections]) max_children: Config.get([:connections_pool, :max_connections])
) )
end end
def start_worker(opts, last_attempt \\ false) do def start_worker(opts, last_attempt \\ false)
case DynamicSupervisor.start_child(__MODULE__, {Pleroma.Gun.ConnectionPool.Worker, opts}) do
{:error, :max_children} ->
funs = [fn -> last_attempt end, fn -> match?(:error, free_pool()) end]
if Enum.any?(funs, fn fun -> fun.() end) do def start_worker(opts, true) do
case DynamicSupervisor.start_child(__MODULE__, {Worker, opts}) do
{:error, :max_children} ->
:telemetry.execute([:pleroma, :connection_pool, :provision_failure], %{opts: opts}) :telemetry.execute([:pleroma, :connection_pool, :provision_failure], %{opts: opts})
{:error, :pool_full} {:error, :pool_full}
else
start_worker(opts, true) res ->
res
end end
end
def start_worker(opts, false) do
case DynamicSupervisor.start_child(__MODULE__, {Worker, opts}) do
{:error, :max_children} ->
spawn(fn -> free_pool() end)
start_worker(opts, true)
res -> res ->
res res

View File

@ -46,7 +46,6 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
end end
end end
@tag :erratic
test "connection limit is respected with concurrent requests" do test "connection limit is respected with concurrent requests" do
clear_config([:connections_pool, :max_connections]) do clear_config([:connections_pool, :max_connections]) do
clear_config([:connections_pool, :max_connections], 1) clear_config([:connections_pool, :max_connections], 1)