Commitdfbba2c

committed

Make sure MaxBackends is always set

Auxiliary and bootstrap processes weren't getting it, causing initdb tofail completely.

1 parentcdbc0ca commitdfbba2cCopy full SHA for dfbba2c

File tree

+25

-6

lines changed

+25

-6

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -899,13 +899,9 @@ PostmasterMain(int argc, char *argv[])`
`899`	`899`
`900`	`900`	`/*`
`901`	`901`	`* Now that loadable modules have had their chance to register background`
`902`		`- * workers, calculate MaxBackends. Add one for the autovacuum launcher.`
	`902`	`+ * workers, calculate MaxBackends.`
`903`	`903`	`*/`
`904`		`-MaxBackends=MaxConnections+autovacuum_max_workers+1+`
`905`		`-GetNumShmemAttachedBgworkers();`
`906`		`-/* internal error because the values were all checked previously */`
`907`		`-if (MaxBackends>MAX_BACKENDS)`
`908`		`-elog(ERROR,"too many backends configured");`
	`904`	`+InitializeMaxBackends();`
`909`	`905`
`910`	`906`	`/*`
`911`	`907`	`* Establish input sockets.`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,26 @@ pg_split_opts(char *argv, int argcp, char *optstr)`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`
	`424`	`+/*`
	`425`	`+ * Initialize MaxBackends value from config options.`
	`426`	`+ *`
	`427`	`+ * This must be called after modules have had the chance to register background`
	`428`	`+ * workers in shared_preload_libraries, and before shared memory size is`
	`429`	`+ * determined.`
	`430`	`+ */`
	`431`	`+void`
	`432`	`+InitializeMaxBackends(void)`
	`433`	`+{`
	`434`	`+Assert(MaxBackends==0);`
	`435`	`+`
	`436`	`+/* the extra unit accounts for the autovacuum launcher */`
	`437`	`+MaxBackends=MaxConnections+autovacuum_max_workers+1+`
	`438`	`+GetNumShmemAttachedBgworkers();`
	`439`	`+`
	`440`	`+/* internal error because the values were all checked previously */`
	`441`	`+if (MaxBackends>MAX_BACKENDS)`
	`442`	`+elog(ERROR,"too many backends configured");`
	`443`	`+}`
`424`	`444`
`425`	`445`	`/*`
`426`	`446`	`* Early initialization of a backend (either standalone or under postmaster).`
`@@ -433,6 +453,8 @@ pg_split_opts(char *argv, int argcp, char *optstr)`
`433`	`453`	`void`
`434`	`454`	`BaseInit(void)`
`435`	`455`	`{`
	`456`	`+InitializeMaxBackends();`
	`457`	`+`
`436`	`458`	`/*`
`437`	`459`	`* Attach to shared memory and semaphores, and initialize our`
`438`	`460`	`* input/output/debugging file descriptors.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,7 @@ extern AuxProcType MyAuxProcType;`
`394`	`394`
`395`	`395`	`/* in utils/init/postinit.c */`
`396`	`396`	`externvoidpg_split_opts(char*argv,intargcp,char*optstr);`
	`397`	`+externvoidInitializeMaxBackends(void);`
`397`	`398`	`externvoidInitPostgres(constcharin_dbname,Oiddboid,constcharusername,`
`398`	`399`	`char*out_dbname);`
`399`	`400`	`externvoidBaseInit(void);`

Comments

(0)