Commit aeec3534 authored by Michael Paquier's avatar Michael Paquier

Use correct connection for cancellation in frontend's parallel slots

While waiting for slots to become available in wait_on_slots() in
parallel_slot.c, the cancellation always relied on the first connection
in the set to do the job.  This could cause problems when this slot's
socket is gone as PQgetCancel() would return NULL in this case.  Rather
than always using the first connection, this changes the logic to use
the first valid connection for the cancellation.

Author: Ranier Vilela
Reviewed-by: Justin Pryzby
Discussion: https://postgr.es/m/CAEudQAokk1h_pUwGXsYS4oVOuf35s1O2o3TXGHpV8=AWikvgHA@mail.gmail.com
Backpatch-through: 14
parent 28d351c9
...@@ -237,7 +237,7 @@ wait_on_slots(ParallelSlotArray *sa) ...@@ -237,7 +237,7 @@ wait_on_slots(ParallelSlotArray *sa)
if (cancelconn == NULL) if (cancelconn == NULL)
return false; return false;
SetCancelConn(sa->slots->connection); SetCancelConn(cancelconn);
i = select_loop(maxFd, &slotset); i = select_loop(maxFd, &slotset);
ResetCancelConn(); ResetCancelConn();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment