Fix a problem with parallel workers being unable to restore role.

check_role() tries to verify that the user has permission to become the
requested role, but this is inappropriate in a parallel worker, which
needs to exactly recreate the master's authorization settings.  So skip
the check in that case.

This fixes a bug in commit 924bcf4f16.
This commit is contained in:
Robert Haas 2015-10-16 11:37:19 -04:00
parent 6de6d96d97
commit 82b37765c7
3 changed files with 14 additions and 2 deletions

View File

@ -96,6 +96,9 @@ int ParallelWorkerNumber = -1;
/* Is there a parallel message pending which we need to receive? */
bool ParallelMessagePending = false;
/* Are we initializing a parallel worker? */
bool InitializingParallelWorker = false;
/* Pointer to our fixed parallel state. */
static FixedParallelState *MyFixedParallelState;
@ -815,6 +818,9 @@ ParallelWorkerMain(Datum main_arg)
char *tstatespace;
StringInfoData msgbuf;
/* Set flag to indicate that we're initializing a parallel worker. */
InitializingParallelWorker = true;
/* Establish signal handlers. */
pqsignal(SIGTERM, die);
BackgroundWorkerUnblockSignals();
@ -942,6 +948,7 @@ ParallelWorkerMain(Datum main_arg)
* We've initialized all of our state now; nothing should change
* hereafter.
*/
InitializingParallelWorker = false;
EnterParallelMode();
/*

View File

@ -19,6 +19,7 @@
#include <ctype.h>
#include "access/htup_details.h"
#include "access/parallel.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_authid.h"
@ -877,9 +878,12 @@ check_role(char **newval, void **extra, GucSource source)
ReleaseSysCache(roleTup);
/*
* Verify that session user is allowed to become this role
* Verify that session user is allowed to become this role, but
* skip this in parallel mode, where we must blindly recreate the
* parallel leader's state.
*/
if (!is_member_of_role(GetSessionUserId(), roleid))
if (!InitializingParallelWorker &&
!is_member_of_role(GetSessionUserId(), roleid))
{
GUC_check_errcode(ERRCODE_INSUFFICIENT_PRIVILEGE);
GUC_check_errmsg("permission denied to set role \"%s\"",

View File

@ -48,6 +48,7 @@ typedef struct ParallelContext
extern bool ParallelMessagePending;
extern int ParallelWorkerNumber;
extern bool InitializingParallelWorker;
#define IsParallelWorker() (ParallelWorkerNumber >= 0)