Commit84f6fb8

committed

Fix IsUnderPostmaster/EXEC_BACKEND confusion

1 parent1565891 commit84f6fb8Copy full SHA for 84f6fb8

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,10 @@ AuxiliaryProcessMain(int argc, char *argv[])`
`359`	`359`	`SetProcessingMode(BootstrapProcessing);`
`360`	`360`	`IgnoreSystemIndexes= true;`
`361`	`361`
	`362`	`+/* Initialize MaxBackends (if under postmaster, was done already) */`
	`363`	`+if (!IsUnderPostmaster)`
	`364`	`+InitializeMaxBackends();`
	`365`	`+`
`362`	`366`	`BaseInit();`
`363`	`367`
`364`	`368`	`/*`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3654,10 +3654,8 @@ PostgresMain(int argc, char argv[], const char username)`
`3654`	`3654`	`*/`
`3655`	`3655`	`CreateDataDirLockFile(false);`
`3656`	`3656`
`3657`		`-/* In EXEC_BACKEND, this was set via BackendParameters */`
`3658`		`-#ifndefEXEC_BACKEND`
	`3657`	`+/* Initialize MaxBackends (if under postmaster, was done already) */`
`3659`	`3658`	`InitializeMaxBackends();`
`3660`		`-#endif`
`3661`	`3659`	`}`
`3662`	`3660`
`3663`	`3661`	`/* Early initialization */`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,11 @@ pg_split_opts(char *argv, int argcp, char *optstr)`
`427`	`427`	`* This must be called after modules have had the chance to register background`
`428`	`428`	`* workers in shared_preload_libraries, and before shared memory size is`
`429`	`429`	`* determined.`
	`430`	`+ *`
	`431`	`+ * Note that in EXEC_BACKEND environment, the value is passed down from`
	`432`	`+ * postmaster to subprocesses via BackendParameters in SubPostmasterMain; only`
	`433`	`+ * postmaster itself and processes not under postmaster control should call`
	`434`	`+ * this.`
`430`	`435`	`*/`
`431`	`436`	`void`
`432`	`437`	`InitializeMaxBackends(void)`

Comments

(0)