Revert "Allow parallel workers to cope with a newly-created session user ID."

tglsfdc · tglsfdc · commit e6a9637488e2 · 2024-07-31T20:57:00.000-04:00
This reverts commit f5f30c2. Some buildfarm animals are failing with "cannot change "client_encoding" during a parallel operation". It looks like assign_client_encoding is unhappy at being asked to roll back a client_encoding setting after a parallel worker encounters a failure. There must be more to it though: why didn't I see this during local testing? In any case, it's clear that moving the RestoreGUCState() call is not as side-effect-free as I thought. Given that the bug f5f30c2 intended to fix has gone unreported for years, it's not something that's urgent to fix; I'm not willing to risk messing with it further with only days to our next release wrap.
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
@@ -1410,6 +1410,10 @@ ParallelWorkerMain(Datum main_arg)
 	libraryspace = shm_toc_lookup(toc, PARALLEL_KEY_LIBRARY, false);
 	StartTransactionCommand();
 	RestoreLibraryState(libraryspace);
+
+	/* Restore GUC values from launching backend. */
+	gucspace = shm_toc_lookup(toc, PARALLEL_KEY_GUC, false);
+	RestoreGUCState(gucspace);
 	CommitTransactionCommand();
 
 	/* Crank up a transaction state appropriate to a parallel worker. */
@@ -1451,14 +1455,6 @@ ParallelWorkerMain(Datum main_arg)
 	 */
 	InvalidateSystemCaches();
 
-	/*
-	 * Restore GUC values from launching backend.  We can't do this earlier,
-	 * because GUC check hooks that do catalog lookups need to see the same
-	 * database state as the leader.
-	 */
-	gucspace = shm_toc_lookup(toc, PARALLEL_KEY_GUC, false);
-	RestoreGUCState(gucspace);
-
 	/*
 	 * Restore current role id.  Skip verifying whether session user is
 	 * allowed to become this role and blindly restore the leader's state for
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -577,16 +577,14 @@ check_transaction_read_only(bool *newval, void **extra, GucSource source)
  * We allow idempotent changes at any time, but otherwise this can only be
  * changed in a toplevel transaction that has not yet taken a snapshot.
  *
- * As in check_transaction_read_only, allow it if not inside a transaction,
- * or if restoring state in a parallel worker.
+ * As in check_transaction_read_only, allow it if not inside a transaction.
  */
 bool
 check_transaction_isolation(int *newval, void **extra, GucSource source)
 {
 	int			newXactIsoLevel = *newval;
 
-	if (newXactIsoLevel != XactIsoLevel &&
-		IsTransactionState() && !InitializingParallelWorker)
+	if (newXactIsoLevel != XactIsoLevel && IsTransactionState())
 	{
 		if (FirstSnapshotSet)
 		{
@@ -621,10 +619,6 @@ check_transaction_isolation(int *newval, void **extra, GucSource source)
 bool
 check_transaction_deferrable(bool *newval, void **extra, GucSource source)
 {
-	/* Just accept the value when restoring state in a parallel worker */
-	if (InitializingParallelWorker)
-		return true;
-
 	if (IsSubTransaction())
 	{
 		GUC_check_errcode(ERRCODE_ACTIVE_SQL_TRANSACTION);
diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out
@@ -1329,21 +1329,3 @@ SELECT 1 FROM tenk1_vw_sec
 (9 rows)
 
 rollback;
--- test that a newly-created session role propagates to workers.
-begin;
-create role regress_parallel_worker;
-set session authorization regress_parallel_worker;
-select current_setting('session_authorization');
-     current_setting     
--------------------------
- regress_parallel_worker
-(1 row)
-
-set debug_parallel_query = 1;
-select current_setting('session_authorization');
-     current_setting     
--------------------------
- regress_parallel_worker
-(1 row)
-
-rollback;
diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql
@@ -511,12 +511,3 @@ SELECT 1 FROM tenk1_vw_sec
   WHERE (SELECT sum(f1) FROM int4_tbl WHERE f1 < unique1) < 100;
 
 rollback;
-
--- test that a newly-created session role propagates to workers.
-begin;
-create role regress_parallel_worker;
-set session authorization regress_parallel_worker;
-select current_setting('session_authorization');
-set debug_parallel_query = 1;
-select current_setting('session_authorization');
-rollback;

Original file line number	Diff line number	Diff line change
`@@ -577,16 +577,14 @@ check_transaction_read_only(bool newval, void *extra, GucSource source)`
`577`	`577`	`* We allow idempotent changes at any time, but otherwise this can only be`
`578`	`578`	`* changed in a toplevel transaction that has not yet taken a snapshot.`
`579`	`579`	`*`
`580`		`- * As in check_transaction_read_only, allow it if not inside a transaction,`
`581`		`- * or if restoring state in a parallel worker.`
	`580`	`+ * As in check_transaction_read_only, allow it if not inside a transaction.`
`582`	`581`	`*/`
`583`	`582`	`bool`
`584`	`583`	`check_transaction_isolation(int newval, void *extra, GucSource source)`
`585`	`584`	`{`
`586`	`585`	`int newXactIsoLevel = *newval;`
`587`	`586`
`588`		`- if (newXactIsoLevel != XactIsoLevel &&`
`589`		`- IsTransactionState() && !InitializingParallelWorker)`
	`587`	`+ if (newXactIsoLevel != XactIsoLevel && IsTransactionState())`
`590`	`588`	`{`
`591`	`589`	`if (FirstSnapshotSet)`
`592`	`590`	`{`
`@@ -621,10 +619,6 @@ check_transaction_isolation(int newval, void *extra, GucSource source)`
`621`	`619`	`bool`
`622`	`620`	`check_transaction_deferrable(bool newval, void *extra, GucSource source)`
`623`	`621`	`{`
`624`		`- /* Just accept the value when restoring state in a parallel worker */`
`625`		`- if (InitializingParallelWorker)`
`626`		`- return true;`
`627`		`-`
`628`	`622`	`if (IsSubTransaction())`
`629`	`623`	`{`
`630`	`624`	`GUC_check_errcode(ERRCODE_ACTIVE_SQL_TRANSACTION);`