Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 292794f

Browse files
committed
Remove PID from 'parallel worker' context message.
Discussion: <bfd204ab-ab1a-792a-b345-0274a09a4b5f@2ndquadrant.com>
1 parent 103512c commit 292794f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/backend/access/transam/parallel.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)
788788
*/
789789
save_error_context_stack = error_context_stack;
790790
errctx.callback = ParallelErrorContext;
791-
errctx.arg = &pcxt->worker[i].pid;
791+
errctx.arg = NULL;
792792
errctx.previous = pcxt->error_context_stack;
793793
error_context_stack = &errctx;
794794

@@ -1095,7 +1095,7 @@ static void
10951095
ParallelErrorContext(void *arg)
10961096
{
10971097
if (force_parallel_mode != FORCE_PARALLEL_REGRESS)
1098-
errcontext("parallel worker, PID %d", *(int32 *) arg);
1098+
errcontext("parallel worker");
10991099
}
11001100

11011101
/*

src/test/regress/expected/select_parallel.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ explain (costs off)
6464
(5 rows)
6565

6666
do $$begin
67-
-- Provoke error in worker. The original message CONTEXT contains a worker
68-
-- PID that must be hidden in the test output.
67+
-- Provoke error, possibly in worker. If this error happens to occur in
68+
-- the worker, there will be a CONTEXT line which must be hidden.
6969
perform stringu1::int2 from tenk1 where unique1 = 1;
7070
exception
7171
when others then

src/test/regress/sql/select_parallel.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ explain (costs off)
3030
select stringu1::int2 from tenk1 where unique1 = 1;
3131

3232
do $$begin
33-
-- Provoke error in worker. The original message CONTEXT contains a worker
34-
-- PID that must be hidden in the test output.
33+
-- Provoke error, possibly in worker. If this error happens to occur in
34+
-- the worker, there will be a CONTEXT line which must be hidden.
3535
perform stringu1::int2 from tenk1 where unique1 = 1;
3636
exception
3737
when others then

0 commit comments

Comments
 (0)