Remove PID from 'parallel worker' context message.

Discussion: <bfd204ab-ab1a-792a-b345-0274a09a4b5f@2ndquadrant.com>

diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 9325b628da3fb506babfe1d90c3c83b87f4fc0c8..088700e17cb910a12e5ddb2cbdbe8ea131f4866e 100644 (file)
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -788,7 +788,7 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)
                 */
                save_error_context_stack = error_context_stack;
                errctx.callback = ParallelErrorContext;
-               errctx.arg = &pcxt->worker[i].pid;
+               errctx.arg = NULL;
                errctx.previous = pcxt->error_context_stack;
                error_context_stack = &errctx;
 
@@ -1095,7 +1095,7 @@ static void
 ParallelErrorContext(void *arg)
 {
    if (force_parallel_mode != FORCE_PARALLEL_REGRESS)
-       errcontext("parallel worker, PID %d", *(int32 *) arg);
+       errcontext("parallel worker");
 }
 
 /*

diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out
index 58ab425add8a3202143119058b50efe5e955de3f..6f1f24748b6247d2555cd983f31fe5c30fe8bb93 100644 (file)
--- a/src/test/regress/expected/select_parallel.out
+++ b/src/test/regress/expected/select_parallel.out
@@ -64,8 +64,8 @@ explain (costs off)
 (5 rows)
 
 do $$begin
-  -- Provoke error in worker.  The original message CONTEXT contains a worker
-  -- PID that must be hidden in the test output.
+  -- Provoke error, possibly in worker.  If this error happens to occur in
+  -- the worker, there will be a CONTEXT line which must be hidden.
   perform stringu1::int2 from tenk1 where unique1 = 1;
   exception
    when others then

diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql
index bb02ee0019fd75faf5d379e7778f0ad6dcaa999b..7b607c203ad8115e6037bdceb3244e9de2476c56 100644 (file)
--- a/src/test/regress/sql/select_parallel.sql
+++ b/src/test/regress/sql/select_parallel.sql
@@ -30,8 +30,8 @@ explain (costs off)
   select stringu1::int2 from tenk1 where unique1 = 1;
 
 do $$begin
-  -- Provoke error in worker.  The original message CONTEXT contains a worker
-  -- PID that must be hidden in the test output.
+  -- Provoke error, possibly in worker.  If this error happens to occur in
+  -- the worker, there will be a CONTEXT line which must be hidden.
   perform stringu1::int2 from tenk1 where unique1 = 1;
   exception
    when others then