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
This commit is contained in:
Michael Paquier 2022-08-27 15:21:31 +09:00
parent e890ce7a4f
commit 52144b6fcd
1 changed files with 1 additions and 1 deletions

View File

@ -235,7 +235,7 @@ wait_on_slots(ParallelSlotArray *sa)
if (cancelconn == NULL)
return false;
SetCancelConn(sa->slots->connection);
SetCancelConn(cancelconn);
i = select_loop(maxFd, &slotset);
ResetCancelConn();