database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

process startup: Remove bootstrap / checker modes from AuxProcType.

Browse Source 
Neither is actually initialized as an auxiliary process, so it does not really
make sense to reserve a PGPROC etc for them.

This keeps checker mode implemented by exiting partway through bootstrap
mode. That might be worth changing at some point, perhaps if we ever extend
checker mode to be a more general tool.

Author: Andres Freund <andres@anarazel.de>
Reviewed-By: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Reviewed-By: Robert Haas <robertmhaas@gmail.com>
Discussion: https://postgr.es/m/20210802164124.ufo5buo4apl6yuvs@alap3.anarazel.de
This commit is contained in:
Andres Freund
2021-08-05 12:17:31 -07:00
parent 0a692109dc
commit f8dd4ecb0b
6 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/backend/bootstrap/bootstrap.c
View File

@ -193,9 +193,14 @@ CheckerModeMain(void)
* The bootstrap mode is used to initialize the template database.
* The bootstrap backend doesn't speak SQL, but instead expects
* commands in a special bootstrap language.
*
* When check_only is true, startup is done only far enough to verify that
* the current configuration, particularly the passed in options pertaining
* to shared memory sizing, options work (or at least do not cause an error
* up to shared memory creation).
*/
void
BootstrapModeMain(int argc, char *argv[])
BootstrapModeMain(int argc, char *argv[], bool check_only)
{
int i;
char *progname = argv[0];
@ -209,16 +214,14 @@ BootstrapModeMain(int argc, char *argv[])
/* Set defaults, to be overridden by explicit options below */
InitializeGUCOptions();
/* an initial --boot should be present */
/* an initial --boot or --check should be present */
Assert(argc == 1
|| strcmp(argv[1], "--boot") != 0);
|| strcmp(argv[1], "--boot") != 0
|| strcmp(argv[1], "--check") != 0);
argv++;
argc--;
/* If no -x argument, we are a CheckerProcess */
MyAuxProcType = CheckerProcess;
while ((flag = getopt(argc, argv, "B:c:d:D:Fkr:x:X:-:")) != -1)
while ((flag = getopt(argc, argv, "B:c:d:D:Fkr:X:-:")) != -1)
{
switch (flag)
{
@ -250,16 +253,6 @@ BootstrapModeMain(int argc, char *argv[])
case 'r':
strlcpy(OutputFileName, optarg, MAXPGPATH);
break;
case 'x':
MyAuxProcType = atoi(optarg);
if (MyAuxProcType != CheckerProcess &&
MyAuxProcType != BootstrapProcess)
{
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("-x %s is invalid", optarg)));
}
break;
case 'X':
{
int WalSegSz = strtoul(optarg, NULL, 0);
@ -338,7 +331,7 @@ BootstrapModeMain(int argc, char *argv[])
* point. Right now it seems like it'd cause more code duplication than
* it's worth.
*/
if (MyAuxProcType == CheckerProcess)
if (check_only)
{
SetProcessingMode(NormalProcessing);
CheckerModeMain();