mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid lockup of a parallel worker when reporting a long error message.

Browse Source 
Because sigsetjmp() will restore the initial state with signals blocked,
the code path in bgworker.c for reporting an error and exiting would
execute that way.  Usually this is fairly harmless; but if a parallel
worker had an error message exceeding the shared-memory communication
buffer size (16K) it would lock up, because it would wait for a
resume-sending signal from its parallel leader which it would never
detect.

To fix, just unblock signals at the appropriate point.

This can be shown to fail back to 9.6.  The lack of parallel query
infrastructure makes it difficult to provide a simple test case for
9.5; but I'm pretty sure the issue exists in some form there as well,
so apply the code change there too.

Vignesh C, reviewed by Bharath Rupireddy, Robert Haas, and myself

Discussion: https://postgr.es/m/CALDaNm1d1hHPZUg3xU4XjtWBOLCrA+-2cJcLpw-cePZ=GgDVfA@mail.gmail.com
This commit is contained in:
Tom Lane 2020-09-03 16:52:09 -04:00
parent 8f8154a503
commit be4b0c0077
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/postmaster/bgworker.c
View File

@ -743,7 +743,7 @@ StartBackgroundWorker(void)
/* /*
* If an exception is encountered, processing resumes here. * If an exception is encountered, processing resumes here.
* *
* See notes in postgres.c about the design of this coding. * We just need to clean up, report the error, and go away.
*/ */
if (sigsetjmp(local_sigjmp_buf, 1) != 0) if (sigsetjmp(local_sigjmp_buf, 1) != 0)
{ {
@ -753,7 +753,14 @@ StartBackgroundWorker(void)
/* Prevent interrupts while cleaning up */ /* Prevent interrupts while cleaning up */
HOLD_INTERRUPTS(); HOLD_INTERRUPTS();
/* Report the error to the server log */ /*
* sigsetjmp will have blocked all signals, but we may need to accept
* signals while communicating with our parallel leader. Once we've
* done HOLD_INTERRUPTS() it should be safe to unblock signals.
*/
BackgroundWorkerUnblockSignals();
/* Report the error to the parallel leader and the server log */
EmitErrorReport(); EmitErrorReport();
/* /*

5
src/test/regress/expected/select_parallel.out
View File

File diff suppressed because one or more lines are too long

3
src/test/regress/sql/select_parallel.sql
View File

@ -400,9 +400,10 @@ EXPLAIN (analyze, timing off, summary off, costs off) SELECT * FROM tenk1;
ROLLBACK TO SAVEPOINT settings; ROLLBACK TO SAVEPOINT settings;
-- provoke error in worker -- provoke error in worker
-- (make the error message long enough to require multiple bufferloads)
SAVEPOINT settings; SAVEPOINT settings;
SET LOCAL force_parallel_mode = 1; SET LOCAL force_parallel_mode = 1;
select stringu1::int2 from tenk1 where unique1 = 1; select (stringu1 || repeat('abcd', 5000))::int2 from tenk1 where unique1 = 1;
ROLLBACK TO SAVEPOINT settings; ROLLBACK TO SAVEPOINT settings;
-- test interaction with set-returning functions -- test interaction with set-returning functions