bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gun/snooze' into 'develop'

Browse source 
Gun: Publisher job behavior improvement

See merge request pleroma/pleroma!4202
This commit is contained in:
feld 2024-08-02 13:49:11 +00:00
commit b389b85d77
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/oban_gun_snooze.change Normal file
View file

@ -0,0 +1 @@
Publisher behavior improvement when snoozing Oban jobs due to Gun connection pool contention.

8
lib/pleroma/web/activity_pub/publisher.ex
View file

@ -143,9 +143,13 @@ def publish_one(%{inbox: inbox, activity_id: activity_id} = params) do
_ -> {:error, e} _ -> {:error, e}
end end
{:error, {:already_started, _}} ->
Logger.debug("Publisher snoozing worker job due worker :already_started race condition")
connection_pool_snooze()
{:error, :pool_full} -> {:error, :pool_full} ->
Logger.debug("Publisher snoozing worker job due to full connection pool") Logger.debug("Publisher snoozing worker job due to full connection pool")
{:snooze, 30} connection_pool_snooze()
e -> e ->
unless params[:unreachable_since], do: Instances.set_unreachable(inbox) unless params[:unreachable_since], do: Instances.set_unreachable(inbox)
@ -155,6 +159,8 @@ def publish_one(%{inbox: inbox, activity_id: activity_id} = params) do
end end
end end
defp connection_pool_snooze, do: {:snooze, 3}
defp signature_host(%URI{port: port, scheme: scheme, host: host}) do defp signature_host(%URI{port: port, scheme: scheme, host: host}) do
if port == URI.default_port(scheme) do if port == URI.default_port(scheme) do
host host