postgres.git / summary / log / commit / refs

commit    52144b6fcd626bb7dbe9fe282329c0174620a34b
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Sat Aug 27 06:21:31 2022 +0000

    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


 src/fe_utils/parallel_slot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fe_utils/parallel_slot.c b/src/fe_utils/parallel_slot.c
index 8bce8ca3663..2be2903c9c6 100644
--- a/src/fe_utils/parallel_slot.c
+++ b/src/fe_utils/parallel_slot.c
@@ -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();
 


[parent: e890ce7a4feb]