From 2bf38f92f647de00c4850202f37d4eaab93ed834 Mon Sep 17 00:00:00 2001
From: "serge.tupchii" <serge.tupchii@protonmail.com>
Date: Tue, 13 Oct 2020 23:00:56 +0300
Subject: [PATCH] Fix checkout_timeout error in hackney_pool caused by
 connection errors

Replace casting checkout_cancel msg in hackney_pool with a hackney_manager:cancel_request/1 call from hackney_connect:
this must ensure that pool checkout is canceled as well as client state is erased
---
 src/hackney_connect.erl |  2 +-
 src/hackney_pool.erl    | 34 +---------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/hackney_connect.erl b/src/hackney_connect.erl
index 982a104b..c39275c4 100644
--- a/src/hackney_connect.erl
+++ b/src/hackney_connect.erl
@@ -232,7 +232,7 @@ socket_from_pool(Host, Port, Transport, Client0) ->
     Error ->
       ?report_trace("connect error", []),
       _ = metrics:increment_counter(Metrics, [hackney, Host, connect_error]),
-
+      hackney_manager:cancel_request(Client),
       Error
   end.
 
diff --git a/src/hackney_pool.erl b/src/hackney_pool.erl
index 1e269777..9559a7fa 100644
--- a/src/hackney_pool.erl
+++ b/src/hackney_pool.erl
@@ -127,8 +127,7 @@ do_checkout(Requester, Host, _Port, Transport, #client{options=Opts,
     {error, Reason} ->
       {error, Reason};
     {'EXIT', {timeout, _}} ->
-      % socket will still checkout so to avoid deadlock we send in a cancellation
-      gen_server:cast(Pool, {checkout_cancel, Connection, RequestRef}),
+      %% checkout should be canceled by the caller via hackney_manager
       {error, checkout_timeout}
   end.
 
@@ -359,18 +358,6 @@ handle_cast({set_maxconn, MaxConn}, State) ->
   {noreply, State#state{max_connections=MaxConn}};
 handle_cast({set_timeout, NewTimeout}, State) ->
   {noreply, State#state{timeout=NewTimeout}};
-
-handle_cast({checkout_cancel, Dest, Ref}, State) ->
-  #state{queues=Queues, pending=Pending} = State,
-  {Queues2, Removed} = del_from_queue(Dest, Ref, Queues),
-  case Removed of
-    true ->
-      Pending2 = del_pending(Ref, Pending),
-      {noreply, State#state{queues=Queues2, pending=Pending2}};
-    false ->
-      % we leak the socket here but 'DOWN' will mop up for us when it times out
-      {noreply, dequeue(Dest, Ref, State)}
-  end;
 handle_cast(_Msg, State) ->
   {noreply, State}.
 
@@ -521,25 +508,6 @@ add_to_queue(Connection, From, Ref, Requester, Queues) ->
       dict:store(Connection, queue:in({From, Ref, Requester}, Q), Queues)
   end.
 
-%------------------------------------------------------------------------------
-%% @private
-%%------------------------------------------------------------------------------
-del_from_queue(Connection, Ref, Queues) ->
-  case dict:find(Connection, Queues) of
-    error ->
-      {Queues, false};
-    {ok, Q} ->
-      Q2 = queue:filter(fun({_, R, _}) -> R =/= Ref end, Q),
-      Removed = queue:len(Q) =/= queue:len(Q2),
-      Queues2 = case queue:is_empty(Q2) of
-                  true ->
-                    dict:erase(Connection, Queues);
-                  false ->
-                    dict:store(Connection, Q2, Queues)
-                end,
-      {Queues2, Removed}
-  end.
-
 %------------------------------------------------------------------------------
 %% @private
 %%------------------------------------------------------------------------------