pleroma

commit: 00e828b1a07d8b825eba1b3503651a899400a281
parent f0468697cd74f4ec062f9c6feda53cfbe9e4500c
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Fri, 23 Feb 2024 06:47:56 +0000

Merge branch 'gun-pool-retry' into 'develop'

Gun connection pool retry fix

See merge request pleroma/pleroma!4076
Diffstat:
A
changelog.d/gun_pool2.fix
1
+
M
lib/pleroma/gun/connection_pool/worker_supervisor.ex
2
+-
M
lib/pleroma/web/activity_pub/publisher.ex
4
++++

3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changelog.d/gun_pool2.fix b/changelog.d/gun_pool2.fix
@@ -0,0 +1 @@
+Connection pool errors when publishing an activity is a soft-error that will be retried shortly.
diff --git a/lib/pleroma/gun/connection_pool/worker_supervisor.ex b/lib/pleroma/gun/connection_pool/worker_supervisor.ex
@@ -21,7 +21,7 @@ defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do
   def start_worker(opts, retry \\ false) do
     case DynamicSupervisor.start_child(__MODULE__, {Pleroma.Gun.ConnectionPool.Worker, opts}) do
       {:error, :max_children} ->
-        funs = [fn -> !retry end, fn -> match?(:error, free_pool()) end]
+        funs = [fn -> retry end, fn -> match?(:error, free_pool()) end]
 
         if Enum.any?(funs, fn fun -> fun.() end) do
           :telemetry.execute([:pleroma, :connection_pool, :provision_failure], %{opts: opts})
diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex
@@ -129,6 +129,10 @@ defmodule Pleroma.Web.ActivityPub.Publisher do
           _ -> {:error, e}
         end
 
+      {:error, :pool_full} ->
+        Logger.debug("Publisher snoozing worker job due to full connection pool")
+        {:snooze, 30}
+
       e ->
         unless params[:unreachable_since], do: Instances.set_unreachable(inbox)
         Logger.metadata(activity: id, inbox: inbox)