diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml index cc6c9b5879..669cea1c0c 100644 --- a/doc/src/sgml/arch-dev.sgml +++ b/doc/src/sgml/arch-dev.sgml @@ -1,4 +1,4 @@ - + Overview of PostgreSQL Internals @@ -124,13 +124,11 @@ know ahead of time how many connections will be made, we have to use a master process that spawns a new server process every time a connection is requested. This master - process is called postmaster and listens at a + process is called postgres and listens at a specified TCP/IP port for incoming connections. Whenever a request - for a connection is detected the postmaster - process spawns a new server process called - postgres. The server tasks - (postgres processes) communicate with each - other using semaphores and + for a connection is detected the postgres + process spawns a new server process. The server tasks + communicate with each other using semaphores and shared memory to ensure data integrity throughout concurrent data access. diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml index 199044a3ef..e17a328493 100644 --- a/doc/src/sgml/backup.sgml +++ b/doc/src/sgml/backup.sgml @@ -1,4 +1,4 @@ - + Backup and Restore @@ -296,7 +296,7 @@ tar -cf backup.tar /usr/local/pgsql/data (mainly because tar and similar tools do not take an atomic snapshot of the state of the file system at a point in time). Information about stopping the server can be found in - . Needless to say that you + . Needless to say that you also need to shut down the server before restoring the data. @@ -778,7 +778,7 @@ SELECT pg_stop_backup(); - It is also possible to make a backup dump while the postmaster is + It is also possible to make a backup dump while the server is stopped. In this case, you obviously cannot use pg_start_backup or pg_stop_backup, and you will therefore be left to your own devices to keep track of which @@ -796,7 +796,7 @@ SELECT pg_stop_backup(); - Stop the postmaster, if it's running. + Stop the server, if it's running. @@ -853,9 +853,9 @@ SELECT pg_stop_backup(); - Start the postmaster. The postmaster will go into recovery mode and + Start the server. The server will go into recovery mode and proceed to read through the archived WAL files it needs. Upon completion - of the recovery process, the postmaster will rename + of the recovery process, the server will rename recovery.conf to recovery.done (to prevent accidentally re-entering recovery mode in case of a crash later) and then commence normal database operations. @@ -1269,7 +1269,7 @@ mv /usr/local/pgsql /usr/local/pgsql.old cd ~/postgresql-&version; gmake install initdb -D /usr/local/pgsql/data -postmaster -D /usr/local/pgsql/data +postgres -D /usr/local/pgsql/data psql -f backup postgres diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml index bb7f17ff78..95606e86a3 100644 --- a/doc/src/sgml/client-auth.sgml +++ b/doc/src/sgml/client-auth.sgml @@ -1,4 +1,4 @@ - + Client Authentication @@ -436,10 +436,10 @@ hostnossl database user The pg_hba.conf file is read on start-up and when - the main server process (postmaster) receives a + the main server process receives a SIGHUPSIGHUP signal. If you edit the file on an - active system, you will need to signal the postmaster + active system, you will need to signal the server (using pg_ctl reload or kill -HUP) to make it re-read the file. @@ -866,10 +866,10 @@ local db1,db2,@demodbs all md5 The pg_ident.conf file is read on start-up and - when the main server process (postmaster) receives a + when the main server process receives a SIGHUPSIGHUP signal. If you edit the file on an - active system, you will need to signal the postmaster + active system, you will need to signal the server (using pg_ctl reload or kill -HUP) to make it re-read the file. diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 9c55fb40e5..ebfd6012fc 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ - + Server Configuration @@ -69,10 +69,9 @@ include 'filename' SIGHUP - The configuration file is reread whenever the - postmaster process receives a + The configuration file is reread whenever the main server process receives a SIGHUP signal (which is most easily sent by means - of pg_ctl reload). The postmaster + of pg_ctl reload). The main server process also propagates this signal to all currently running server processes so that existing sessions also get the new value. Alternatively, you can send the signal to a single server @@ -83,9 +82,9 @@ include 'filename' A second way to set these configuration parameters is to give them - as a command line option to the postmaster, such as: + as a command-line option to the postgres command, such as: -postmaster -c log_connections=yes -c log_destination='syslog' +postgres -c log_connections=yes -c log_destination='syslog' Command-line options override any conflicting settings in postgresql.conf. Note that this means you won't @@ -116,7 +115,7 @@ env PGOPTIONS='-c geqo=off' psql and , respectively, are used to configure these settings. Per-database settings override anything received from the - postmaster command-line or the configuration + postgres command-line or the configuration file, and in turn are overridden by per-user settings; both are overridden by per-session settings. @@ -192,7 +191,7 @@ SET ENABLE_SEQSCAN TO OFF; Specifies the main server configuration file (customarily called postgresql.conf). - This parameter can only be set on the postmaster command line. + This parameter can only be set on the postgres command line. @@ -234,8 +233,7 @@ SET ENABLE_SEQSCAN TO OFF; Specifies the name of an additional process-id (PID) file that the - postmaster should create for use by server - administration programs. + server should create for use by server administration programs. This parameter can only be set at server start. @@ -252,7 +250,7 @@ SET ENABLE_SEQSCAN TO OFF; If you wish to keep the configuration files elsewhere than the - data directory, the postmaster's + data directory, the postgres command-line option or PGDATA environment variable must point to the directory containing the configuration files, and the data_directory parameter must be set in @@ -269,7 +267,7 @@ SET ENABLE_SEQSCAN TO OFF; individually using the parameters config_file, hba_file and/or ident_file. config_file can only be specified on the - postmaster command line, but the others can be + postgres command line, but the others can be set within the main configuration file. If all three parameters plus data_directory are explicitly set, then it is not necessary to specify or PGDATA. @@ -277,7 +275,7 @@ SET ENABLE_SEQSCAN TO OFF; When setting any of these parameters, a relative path will be interpreted - with respect to the directory in which the postmaster + with respect to the directory in which postgres is started. @@ -2679,7 +2677,7 @@ SELECT * FROM parent WHERE key = 2400; below - anything else that looks like an escape is ignored. Other characters are copied straight to the log line. Some escapes are only recognized by session processes, and do not apply to - background processes such as the postmaster. Syslog + background processes such as the main server process. Syslog produces its own time stamp and process ID information, so you probably do not want to use those escapes if you are using syslog. @@ -3467,7 +3465,7 @@ SELECT * FROM parent WHERE key = 2400; Only superusers can change this setting, because it affects the - messages sent to the postmaster log as well as to the client. + messages sent to the server log as well as to the client. diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index cdb55a2b52..7722f958c1 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -1,4 +1,4 @@ - + Data Types @@ -2153,7 +2153,7 @@ January 8 04:05:06 1999 PST If timezone is not specified in - postgresql.conf nor as a postmaster command-line switch, + postgresql.conf nor as a server command-line option, the server attempts to use the value of the TZ environment variable as the default time zone. If TZ is not defined or is not any of the time zone names known to diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 5e5cfaf17b..9e6f332e5b 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ - + Functions and Operators @@ -8935,7 +8935,7 @@ select current_date + s.a as dates from generate_series(0,14,7) as s(a); pg_postmaster_start_time() timestamp with time zone - postmaster start time + server start time @@ -9044,7 +9044,7 @@ SET search_path TO schema , schema, .. pg_postmaster_start_time returns the timestamp with time zone when the - postmaster started. + server started. @@ -9850,7 +9850,7 @@ SELECT set_config('log_statement_stats', 'off', false); pg_reload_conf sends a SIGHUP signal - to the postmaster, causing the configuration files + to the server, causing the configuration files to be reloaded by all server processes. diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 9386c66ea7..f2463d9b9e 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1,4 +1,4 @@ - + <![%standalone-include[<productname>PostgreSQL</>]]> @@ -33,7 +33,7 @@ mkdir /usr/local/pgsql/data chown postgres /usr/local/pgsql/data su - postgres /usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data -/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data >logfile 2>&1 & +/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data >logfile 2>&1 & /usr/local/pgsql/bin/createdb test /usr/local/pgsql/bin/psql test </synopsis> @@ -463,7 +463,7 @@ su - postgres (which you already have if you are upgrading). <programlisting> <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</> -<userinput>/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data</> +<userinput>/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data</> </programlisting> Finally, restore your data with <screen> @@ -1638,12 +1638,12 @@ postgres$ <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</> database server. Do so now. The command should look something like <programlisting> -/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data +/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data </programlisting> This will start the server in the foreground. To put the server in the background use something like <programlisting> -nohup /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data \ +nohup /usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data \ </dev/null >>server.log 2>&1 </dev/null & </programlisting> </para> @@ -1654,12 +1654,6 @@ nohup /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data \ kill `cat /usr/local/pgsql/data/postmaster.pid` </programlisting> </para> - - <para> - In order to allow TCP/IP connections (rather than only Unix - domain socket ones) you need to pass the <option>-i</> option to - <filename>postmaster</>. - </para> </step> <step> diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml index fa7423d5c3..784b21bb5c 100644 --- a/doc/src/sgml/maintenance.sgml +++ b/doc/src/sgml/maintenance.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.55 2006/04/23 03:39:52 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.56 2006/06/18 15:38:35 petere Exp $ --> <chapter id="maintenance"> <title>Routine Database Maintenance Tasks @@ -403,10 +403,10 @@ HINT: Stop the postmaster and use a standalone backend to VACUUM in "mydb". administrator recover without data loss, by manually executing the required VACUUM commands. However, since the system will not execute commands once it has gone into the safety shutdown mode, - the only way to do this is to stop the postmaster and use a standalone + the only way to do this is to stop the server and use a single-user backend to execute VACUUM. The shutdown mode is not enforced - by a standalone backend. See the reference - page for details about using a standalone backend. + by a single-user backend. See the reference + page for details about using a single-user backend. @@ -628,17 +628,17 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu - If you simply direct the stderr of the - postmaster into a + If you simply direct the stderr of + postgres into a file, you will have log output, but the only way to truncate the log file is to stop and restart - the postmaster. This may be OK if you are using + the server. This may be OK if you are using PostgreSQL in a development environment, but few production servers would find this behavior acceptable. - A better approach is to send the postmaster's + A better approach is to send the server's stderr output to some type of log rotation program. There is a built-in log rotation program, which you can use by setting the configuration parameter redirect_stderr to @@ -653,7 +653,7 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu server software. For example, the rotatelogs tool included in the Apache distribution can be used with PostgreSQL. To do this, - just pipe the postmaster's + just pipe the server's stderr output to the desired program. If you start the server with pg_ctl, then stderr diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml index cb0eb7a6dc..6b1ad39046 100644 --- a/doc/src/sgml/manage-ag.sgml +++ b/doc/src/sgml/manage-ag.sgml @@ -1,4 +1,4 @@ - + Managing Databases @@ -81,7 +81,7 @@ SELECT datname FROM pg_database; In order to create a database, the PostgreSQL server must be up and running (see ). + linkend="server-start">). @@ -491,7 +491,7 @@ SELECT spcname FROM pg_tablespace; point to each of the non-built-in tablespaces defined in the cluster. Although not recommended, it is possible to adjust the tablespace layout by hand by redefining these links. Two warnings: do not do so - while the postmaster is running; and after you restart the postmaster, + while the server is running; and after you restart the server, update the pg_tablespace catalog to show the new locations. (If you do not, pg_dump will continue to show the old tablespace locations.) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index c9a2c4f3e6..2eac524f80 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -1,4 +1,4 @@ - + Monitoring Database Activity @@ -49,7 +49,7 @@ $ ps auxww | grep ^postgres -postgres 960 0.0 1.1 6104 1480 pts/1 SN 13:17 0:00 postmaster -i +postgres 960 0.0 1.1 6104 1480 pts/1 SN 13:17 0:00 postgres -i postgres 963 0.0 1.1 7084 1472 pts/1 SN 13:17 0:00 postgres: stats buffer process postgres 965 0.0 1.1 6152 1512 pts/1 SN 13:17 0:00 postgres: stats collector process postgres 998 0.0 2.3 6532 2992 pts/1 SN 13:18 0:00 postgres: tgl runbug 127.0.0.1 idle @@ -60,7 +60,7 @@ postgres 1016 0.1 2.4 6532 3080 pts/1 SN 13:19 0:00 postgres: tgl reg (The appropriate invocation of ps varies across different platforms, as do the details of what is shown. This example is from a recent Linux system.) The first process listed here is the - postmaster, the master server process. The command arguments + the master server process. The command arguments shown for it are the same ones given when it was launched. The next two processes implement the statistics collector, which will be described in detail in the next section. (These will not be present if you have set @@ -89,10 +89,10 @@ postgres: user database host /usr/ucb/ps, rather than /bin/ps. You also must use two flags, not just one. In addition, your original invocation of the - postmaster command must have a shorter + postgres command must have a shorter ps status display than that provided by each server process. If you fail to do all three things, the ps - output for each server process will be the original postmaster + output for each server process will be the original postgres command line. diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml index 132abc7f31..0e02d3d92f 100644 --- a/doc/src/sgml/problems.sgml +++ b/doc/src/sgml/problems.sgml @@ -1,4 +1,4 @@ - + Bug Reporting Guidelines @@ -223,7 +223,7 @@ SELECT version(); to find out the version of the server you are connected to. Most executable programs also support a option; at least - postmaster --version and psql --version + postgres --version and psql --version should work. If the function or the options do not exist then your version is more than old enough to warrant an upgrade. @@ -283,7 +283,7 @@ are specifically talking about the backend server, mention that, do not just say PostgreSQL crashes. A crash of a single backend server process is quite different from crash of the parent - postmaster process; please don't say the postmaster + postgres process; please don't say the server crashed when you mean a single backend process went down, nor vice versa. Also, client programs such as the interactive frontend psql are completely separate from the backend. Please try to be specific diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 73eef92fff..009cedd868 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1,4 +1,4 @@ - + Frontend/Backend Protocol @@ -1044,7 +1044,7 @@ this case is effectively synchronous — but it is also possible for parameter status changes to occur because the administrator changed a configuration file and then sent the - SIGHUP signal to the postmaster. Also, + SIGHUP signal to the server. Also, if a SET command is rolled back, an appropriate ParameterStatus message will be generated to report the current effective value. diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index 9c19f849f2..de4966614c 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -1,5 +1,5 @@ @@ -55,7 +55,7 @@ ALTER DATABASE name OWNER TO postgresql.conf or has been received from the - postmaster command line. Only the database + postgres command line. Only the database owner or a superuser can change the session defaults for a database. Certain variables cannot be set this way, or can only be set by a superuser. diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index a70b56eab2..683e0f054e 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -1,5 +1,5 @@ @@ -81,7 +81,7 @@ ALTER ROLE name RESET a specified configuration variable. Whenever the role subsequently starts a new session, the specified value becomes the session default, overriding whatever setting is present in postgresql.conf - or has been received from the postmaster command line. + or has been received from the postgres command line. (For a role without LOGIN privilege, session defaults have no effect.) Ordinary roles can change their own session defaults. diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index 664a8d8fb5..69e44c6130 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -1,5 +1,5 @@ @@ -127,7 +127,7 @@ PostgreSQL documentation initdb, but you can avoid writing it by setting the PGDATA environment variable, which can be convenient since the database server - (postmaster) can find the database + (postgres) can find the database directory later by the same variable. @@ -287,7 +287,6 @@ PostgreSQL documentation - diff --git a/doc/src/sgml/ref/ipcclean.sgml b/doc/src/sgml/ref/ipcclean.sgml index 1ec6a4c346..4e58258f86 100644 --- a/doc/src/sgml/ref/ipcclean.sgml +++ b/doc/src/sgml/ref/ipcclean.sgml @@ -1,5 +1,5 @@ @@ -32,7 +32,7 @@ PostgreSQL documentation semaphore sets owned by the current user. It is intended to be used for cleaning up after a crashed PostgreSQL server (). Note that immediately restarting the + linkend="app-postgres">). Note that immediately restarting the server will also clean up shared memory and semaphores, so this command is of little real utility. @@ -53,7 +53,7 @@ PostgreSQL documentation This script is a hack, but in the many years since it was written, no one has come up with an equally effective and portable solution. - Since the postmaster can now clean up by + Since postgres can now clean up by itself, it is unlikely that ipcclean will be improved upon in the future. diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index 81fefe5280..d67fad4d2b 100644 --- a/doc/src/sgml/ref/pg_ctl-ref.sgml +++ b/doc/src/sgml/ref/pg_ctl-ref.sgml @@ -1,5 +1,5 @@ @@ -92,7 +92,7 @@ PostgreSQL documentation pg_ctl is a utility for starting, stopping, or restarting the PostgreSQL - backend server (), or displaying the + backend server (), or displaying the status of a running server. Although the server can be started manually, pg_ctl encapsulates tasks such as redirecting log output and properly detaching from the terminal @@ -109,7 +109,7 @@ PostgreSQL documentation standard output (not standard error). If no log file is chosen, the standard output of pg_ctl should be redirected to a file or piped to another process such as a log rotating program - like rotatelogs; otherwise the postmaster + like rotatelogs; otherwise postgres will write its output to the controlling terminal (from the background) and will not leave the shell's process group. @@ -129,13 +129,13 @@ PostgreSQL documentation mode effectively executes a stop followed - by a start. This allows changing the postmaster + by a start. This allows changing the postgres command-line options. mode simply sends the - postmaster process a SIGHUP + postgres process a SIGHUP signal, causing it to reread its configuration files (postgresql.conf, pg_hba.conf, etc.). This allows changing of @@ -215,7 +215,7 @@ PostgreSQL documentation Specifies options to be passed directly to the - postmaster command. + postgres command. The options are usually surrounded by single or double @@ -228,12 +228,12 @@ PostgreSQL documentation - Specifies the location of the postmaster - executable. By default the postmaster executable is taken from the same + Specifies the location of the postgres + executable. By default the postgres executable is taken from the same directory as pg_ctl, or failing that, the hard-wired installation directory. It is not necessary to use this option unless you are doing something unusual and get errors - that the postmaster executable was not found. + that the postgres executable was not found. @@ -344,7 +344,7 @@ PostgreSQL documentation - For others, see . + For others, see . @@ -373,7 +373,7 @@ PostgreSQL documentation If this file exists in the data directory, pg_ctl (in mode) will pass the contents of the file as options to the - postmaster command, unless overridden by the + postgres command, unless overridden by the option. @@ -385,8 +385,8 @@ PostgreSQL documentation If this file exists in the data directory, pg_ctl (in mode) - will pass the contents of the file as options to the - postmaster, unless overridden + will pass the contents of the file as options to + postgres, unless overridden by the option. The contents of this file are also displayed in mode. @@ -500,9 +500,9 @@ PostgreSQL documentation $ pg_ctl status -pg_ctl: postmaster is running (pid: 13718) +pg_ctl: server is running (pid: 13718) Command line was: -/usr/local/pgsql/bin/postmaster '-D' '/usr/local/pgsql/data' '-p' '5433' '-B' '128' +/usr/local/pgsql/bin/postgres '-D' '/usr/local/pgsql/data' '-p' '5433' '-B' '128' This is the command line that would be invoked in restart mode. @@ -515,7 +515,7 @@ Command line was: See Also - + diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetxlog.sgml index e407e6c4ef..acdf0c7aed 100644 --- a/doc/src/sgml/ref/pg_resetxlog.sgml +++ b/doc/src/sgml/ref/pg_resetxlog.sgml @@ -1,5 +1,5 @@ @@ -168,8 +168,7 @@ PostgreSQL documentation server crashed then a lock file may have been left behind; in that case you can remove the lock file to allow pg_resetxlog to run. But before you do - so, make doubly certain that there - is no postmaster nor any backend server process still alive. + so, make doubly certain that there is no server process still alive. diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml index 1cf8521beb..bbc3d29e5d 100644 --- a/doc/src/sgml/ref/postgres-ref.sgml +++ b/doc/src/sgml/ref/postgres-ref.sgml @@ -1,29 +1,28 @@ - + - postgres + postgres 1 Application postgres - run a PostgreSQL server in single-user mode + PostgreSQL database server - postgres (the program) + postgres postgres option - database @@ -31,85 +30,500 @@ PostgreSQL documentation Description - The postgres executable is the actual - PostgreSQL server process that processes - SQL statements. It is normally not called directly; instead a - multiuser server is started. - Conceptually, the postmaster starts a new - postgres process for each connection. - (postmaster and postgres - are in fact the same program, and on most platforms the connection - process is forked). + postgres is the + PostgreSQL database server. In order + for a client application to access a database it connects (over a + network or locally) to a running postgres process. + The postgres instance then starts a separate server + process to handle the connection. - If the postgres command is called directly, it - invokes the server in interactive single-user mode. The primary - use for this mode is during bootstrapping by . Sometimes it is used for debugging or - disaster recovery. - When invoked in interactive mode from the shell, the user can enter - queries and the results will be printed to the screen, but in a - form that is more useful for developers than end users. But note - that running a single-user server is not truly suitable for - debugging the server since no realistic interprocess communication - and locking will happen. + One postgres instance always manages the data from + exactly one database cluster. A database cluster is a collection + of databases that is stored at a common file system location (the + data area). More than one + postgres process can run on a system at one + time, so long as they use different data areas and different + communication ports (see below). When + postgres starts it needs to know the location + of the data area. The location must be specified by the + option or the PGDATA environment + variable; there is no default. Typically, or + PGDATA points directly to the data area directory + created by initdb. Other possible file layouts are + discussed in . A + data area is created with . - When running a stand-alone server, the session user will be set to - the user with ID 1. This user does not actually have to exist, so - a stand-alone server can be used to manually recover from certain + By default postgres starts in the + foreground and prints log messages to the standard error stream. In + practical applications the postgres + should be started as a background process, perhaps at boot time. + + + + The postgres command can also be called in + single-user mode. The primary use for this mode is during + bootstrapping by . Sometimes it is used + for debugging or disaster recovery. When invoked in interactive + mode from the shell, the user can enter queries and the results + will be printed to the screen, but in a form that is more useful + for developers than end users. But note that running a single-user + server is not truly suitable for debugging the server since no + realistic interprocess communication and locking will happen. When + running a stand-alone server, the session user will be set to the + user with ID 1. This user does not actually have to exist, so a + stand-alone server can be used to manually recover from certain kinds of accidental damage to the system catalogs. Implicit - superuser powers are granted to the user with ID 1 in stand-alone + superuser powers are granted to the user with ID 1 in single-user mode. - + Options - When postgres is started by a then it inherits all options set by the - latter. In single-user mode, postgres accepts - all the options that postmaster would accept. - - - - You can avoid having to type these options by setting up a - configuration file. See for details. Some - (safe) options can also be set from the connecting client in an - application-dependent way. For example, if the environment - variable PGOPTIONS is set, then - libpq-based clients will pass that string to the - server, which will interpret it as + postgres accepts the following command-line + arguments. For a detailed discussion of the options consult . You can save typing most of these + options by setting up a configuration file. Some (safe) options + can also be set from the connecting client in an + application-dependent way to apply only for that session. For + example, if the environment variable PGOPTIONS is + set, then libpq-based clients will pass that + string to the server, which will interpret it as postgres command-line options. General Purpose + + + + + + + Enables run-time assertion checks, which is a debugging aid to + detect programming mistakes. This option is only available if + assertions were enabled when PostgreSQL was + compiled. If so, the default is on. + + + - - The options , , - , , , - , , , - , and - have the same meanings as with the - except that -d 0 prevents the server log level of the - postmaster from being propagated to - postgres. Other postmaster - options are also accepted but will have no noticeable effect - because they only apply to the multiuser server mode, namely - , , , - , and . - + + + + + Sets the number of shared buffers for use by the server + processes. The default value of this parameter is chosen + automatically by initdb; refer to for more information. + + + + + + + + + Sets a named run-time parameter. The configuration parameters + supported by PostgreSQL are + described in . Most of the + other command line options are in fact short forms of such a + parameter assignment. + + + + + + + + Sets the debug level. The higher this value is set, the more + debugging output is written to the server log. Values are + from 1 to 5. It is also possible to pass -d + 0 for a specific session, which will prevent the + server log level of the postgres from being + propagated to this session. + + + + + + + + + Specifies the file system location of the data directory or + configuration file(s). See + for details. + + + + + + + + + Sets the default date style to European, that is + DMY ordering of input date fields. This also causes + the day to be printed before the month in certain date output formats. + See for more information. + + + + + + + + + Disables fsync calls for improved + performance, at the risk of data corruption in the event of a + system crash. Specifying this option is equivalent to + disabling the configuration + parameter. Read the detailed documentation before using this! + + + + has the opposite effect + of this option. + + + + + + + + + Specifies the IP host name or address on which + postgres is to listen for TCP/IP + connections from client applications. The value can also be a + comma-separated list of addresses, or * to specify + listening on all available interfaces. An empty value + specifies not listening on any IP addresses, in which case + only Unix-domain sockets can be used to connect to the + postgres. Defaults to listening only on + localhost. + Specifying this option is equivalent to setting the configuration parameter. + + + + + + + + + Allows remote clients to connect via TCP/IP (Internet domain) + connections. Without this option, only local connections are + accepted. This option is equivalent to setting + listen_addresses to * in + postgresql.conf or via + + This option is deprecated since it does not allow access to the + full functionality of . + It's usually better to set listen_addresses directly. + + + + + + + + + Specifies the directory of the Unix-domain socket on which + postgres is to listen for + connections from client applications. The default is normally + /tmp, but can be changed at build time. + + + + + + + + + Enables secure connections using SSL. + PostgreSQL must have been compiled with + support for SSL for this option to be + available. For more information on using SSL, + refer to . + + + + + + + + + Sets the maximum number of client connections that this + postgres will accept. By + default, this value is 32, but it can be set as high as your + system will support. (Note that + is required to be at least twice + . See for a discussion of + system resource requirements for large numbers of client + connections.) Specifying this option is equivalent to setting the + configuration parameter. + + + + + + + + + The command line-style options specified in extra-options are passed to + all server processes started by this + postgres. If the option string contains + any spaces, the entire string must be quoted. + + + + The use of this option is obsolete; all command-line options + for server processes can be specified directly on the + postgres command line + + + + + + + + + Specifies the TCP/IP port or local Unix domain socket file + extension on which postgres + is to listen for connections from client applications. + Defaults to the value of the PGPORT environment + variable, or if PGPORT is not set, then + defaults to the value established during compilation (normally + 5432). If you specify a port other than the default port, + then all client applications must specify the same port using + either command-line options or PGPORT. + + + + + + + + + Print time information and other statistics at the end of each command. + This is useful for benchmarking or for use in tuning the number of + buffers. + + + + + + + + + Specifies that the postgres + process should start up in silent mode. That is, it will + disassociate from the user's (controlling) terminal, start its + own process group, and redirect its standard output and + standard error to /dev/null. + + + Using this switch discards all logging output, which is + probably not what you want, since it makes it very difficult + to troubleshoot problems. See below for a better way to start + postgres in the background. + + + has the opposite effect + of this option. + + + + + + + + + Sets a named run-time parameter; a shorter form of + + + + + + + + + This option dumps out the server's internal configuration variables, + descriptions, and defaults in tab-delimited COPY format. + It is designed primarily for use by administration tools. + + + + - Options for stand-alone mode + Semi-internal Options + + + There are several other options that may be specified, used + mainly for debugging purposes and in some cases to assist with + recovery of severely damaged databases. There should be no reason + to use them in a production database setup. These are listed + here only for the use by PostgreSQL + system developers. Furthermore, any of these options may + disappear or change in a future release without notice. + + + { s | i | m | n | h } + + + Forbids the use of particular scan and join methods: + s and i + disable sequential and index scans respectively, while + n, m, and h + disable nested-loop, merge and hash joins respectively. + + + + Neither sequential scans nor nested-loop joins can be disabled + completely; the -fs and + -fn options simply discourage the optimizer + from using those plan types if it has any other alternative. + + + + + + + + + This option is for debugging problems that cause a server + process to die abnormally. The ordinary strategy in this + situation is to notify all other server processes that they + must terminate and then reinitialize the shared memory and + semaphores. This is because an errant server process could + have corrupted some shared state before terminating. This + option specifies that postgres will + not reinitialize shared data structures. A knowledgeable + system programmer can then use a debugger to examine shared + memory and semaphore state. + + + + + + + + + Allows the structure of system tables to be modified. This is + used by initdb. + + + + + + + + + Ignore system indexes when reading system tables (but still update + the indexes when modifying the tables). This is useful when + recovering from damaged system indexes. + + + + + + pa[rser] | pl[anner] | e[xecutor] + + + Print timing statistics for each query relating to each of the + major system modules. This option cannot be used together + with the option. + + + + + + + + + This option is for debugging problems that cause a server + process to die abnormally. The ordinary strategy in this + situation is to notify all other server processes that they + must terminate and then reinitialize the shared memory and + semaphores. This is because an errant server process could + have corrupted some shared state before terminating. This + option specifies that postgres will + stop all other server processes by sending the signal + SIGSTOP, but will not cause them to + terminate. This permits system programmers to collect core + dumps from all server processes by hand. + + + + + + protocol + + + Specifies the version number of the frontend/backend protocol + to be used for a particular session. This option is for + internal use only. + + + + + + seconds + + + A delay of this many seconds occurs when a new server process + is started, after it conducts the authentication procedure. + This is intended to give an opportunity to attach to the + server process with a debugger. + + + + + + database + + + Indicates that this is a subprocess started by + postgres and specifies the database to + use. This option is for internal use only. + + + + + + + + Options for single-user mode + + + The following options only apply to the single-user mode. + + + + + + + + Selects the single-user mode. This must be the first argument + on the command line. + + + + database @@ -142,69 +556,33 @@ PostgreSQL documentation filename - Send all server log output to - filename. - If postgres is running under the - postmaster, this option is ignored, - and the stderr inherited from the - postmaster is used. + Send all server log output to filename. In normal multiuser + mode, this option is ignored, and stderr is + used by all processes. - - - Semi-internal Options - - - The options , , - , , and - have the same meanings as with the and are reserved for debugging and - disaster recovery. Further options for internal use are: - - - - protocol - - - Specifies the version number of the frontend/backend protocol - to be used for this particular session. - - - - - - database - - - Indicates that this process has been started by a - postmaster and specifies the database to use. - etc. - - - - - - - - - This option dumps out the server's internal configuration variables, - descriptions, and defaults in tab-delimited COPY format. - It is designed primarily for use by administration tools. - - - - - - Environment + + PGCLIENTENCODING + + + + Default character encoding used by clients. (The clients may + override this individually.) This value can also be set in the + configuration file. + + + + PGDATA @@ -214,47 +592,154 @@ PostgreSQL documentation + + + PGDATESTYLE + + + + Default value of the run-time + parameter. (The use of this environment variable is deprecated.) + + + + + + PGPORT + + + + Default port (preferably set in the configuration file) + + + + + + TZ + + + + Server time zone + + + + + + Diagnostics + + + A failure message mentioning semget or + shmget probably indicates you need to configure your + kernel to provide adequate shared memory and semaphores. For more + discussion see . You may be able + to postpone reconfiguring your kernel by decreasing to reduce the shared memory + consumption of PostgreSQL, and/or by reducing + to reduce the semaphore + consumption. + + + + A failure message suggesting that another server is already running + should be checked carefully, for example by using the command + +$ ps ax | grep postgres + + or + +$ ps -ef | grep postgres + + depending on your system. If you are certain that no conflicting + server is running, you may remove the lock file mentioned in the + message and try again. + + + + A failure message indicating inability to bind to a port may + indicate that that port is already in use by some + non-PostgreSQL process. You may also + get this error if you terminate postgres + and immediately restart it using the same port; in this case, you + must simply wait a few seconds until the operating system closes + the port before trying again. Finally, you may get this error if + you specify a port number that your operating system considers to + be reserved. For example, many versions of Unix consider port + numbers under 1024 to be trusted and only permit + the Unix superuser to access them. + + + + Notes + + + If at all possible, do not use + SIGKILL to kill the main + postgres server. Doing so will prevent + postgres from freeing the system + resources (e.g., shared memory and semaphores) that it holds before + terminating. This may cause problems for starting a fresh + postgres run. + + + + To terminate the postgres server normally, the + signals SIGTERM, SIGINT, or + SIGQUIT can be used. The first will wait for + all clients to terminate before quitting, the second will + forcefully disconnect all clients, and the third will quit + immediately without proper shutdown, resulting in a recovery run + during restart. The SIGHUP signal will reload + the server configuration files. It is also possible to send + SIGHUP to an individual server process, but that + is usually not sensible. + + + + The utility command can be used to + start and shut down the postgres server + safely and comfortably. + To cancel a running query, send the SIGINT signal - to the postgres process running that command. + to the process running that command. - To tell postgres to reload the configuration files, - send a SIGHUP signal. Normally it's best to - SIGHUP the postmaster instead; - the postmaster will in turn SIGHUP - each of its children. But in some cases it might be desirable to have only - one postgres process reload the configuration files. - - - - The postmaster uses SIGTERM - to tell a postgres process to quit normally and + The postgres server uses SIGTERM + to tell subordinate server processes to quit normally and SIGQUIT to terminate without the normal cleanup. - These signals should not be used by users. It is also - unwise to send SIGKILL to a postgres - process — the postmaster will interpret this as - a crash in postgres, and will force all the sibling - postgres processes to quit as part of its standard - crash-recovery procedure. + These signals should not be used by users. It + is also unwise to send SIGKILL to a server + process — the main postgres process will + interpret this as a crash and will force all the sibling processes + to quit as part of its standard crash-recovery procedure. + + + Bugs + + The Usage - Start a stand-alone server with a command like + To start a single-user mode server, use a command like -postgres -D /usr/local/pgsql/data other-options my_database +postgres --single -D /usr/local/pgsql/data other-options my_database Provide the correct path to the database directory with - Normally, the stand-alone server treats newline as the command + Normally, the single-user mode server treats newline as the command entry terminator; there is no intelligence about semicolons, as there is in psql. To continue a command across multiple lines, you must type backslash just before each @@ -285,10 +770,57 @@ PostgreSQL documentation - Note that the stand-alone server does not provide sophisticated + Note that the single-user mode server does not provide sophisticated line-editing features (no command history, for example). + + + Examples + + + To start postgres in the background + using default values, type: + + +$ nohup postgres >logfile 2>&1 </dev/null & + + + + + To start postgres with a specific + port: + +$ postgres -p 1234 + + This command will start up postgres + communicating through the port 1234. In order to connect to this + postgres using psql, you would need to + run it as + +$ psql -p 1234 + + or set the environment variable PGPORT: + +$ export PGPORT=1234 +$ psql + + + + + Named run-time parameters can be set in either of these styles: + +$ postgres -c work_mem=1234 +$ postgres --work-mem=1234 + + Either form overrides whatever setting might exist for + work_mem in postgresql.conf. Notice that + underscores in parameter names can be written as either underscore + or dash on the command line. Except for short-term experiments, + it's probably better practice to edit the setting in + postgresql.conf than to rely on a command-line switch + to set a parameter. + @@ -296,26 +828,7 @@ PostgreSQL documentation , - , - + - - - diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml index 94c965a9d2..49a5278fb3 100644 --- a/doc/src/sgml/ref/postmaster.sgml +++ b/doc/src/sgml/ref/postmaster.sgml @@ -1,5 +1,5 @@ @@ -12,7 +12,7 @@ PostgreSQL documentation postmaster - PostgreSQL multiuser database server + PostgreSQL database server @@ -30,659 +30,15 @@ PostgreSQL documentation Description - postmaster is the - PostgreSQL multiuser database server. - In order for a client application to access a database it connects - (over a network or locally) to a running - postmaster. The - postmaster then starts a separate server - process () to handle - the connection. The postmaster also - manages the communication among server processes. + postmaster is a deprecated alias of postgres. - - - By default the postmaster starts in the - foreground and prints log messages to the standard error stream. In - practical applications the postmaster - should be started as a background process, perhaps at boot time. - - - - One postmaster always manages the data - from exactly one database cluster. A database cluster is a - collection of databases that is stored at a common file system - location (the data area). - More than one postmaster process can run on a system - at one time, so long as they use different data areas and different - communication ports (see below). - - - - When the postmaster starts it needs - to know the location of the data area. - The location must be specified by the option - or the PGDATA environment variable; there is no default. - Typically, or PGDATA points - directly to the data area directory created by initdb. - Other possible file layouts are discussed in - . - A data area is created with . - - - - - Options - - - postmaster accepts the following - command line arguments. For a detailed discussion of the options - consult . You can save typing most of these - options by setting up a configuration file. - - - - General Purpose - - - - - - - Enables run-time assertion checks, which is a debugging aid to - detect programming mistakes. This option is only available if - assertions were enabled when PostgreSQL was - compiled. If so, the default is on. - - - - - - - - - Sets the number of shared buffers for use by the server - processes. The default value of this parameter is chosen - automatically by initdb; refer to for more information. - - - - - - - - - Sets a named run-time parameter. The configuration parameters - supported by PostgreSQL are - described in . Most of the - other command line options are in fact short forms of such a - parameter assignment. - - - - - - - - Sets the debug level. The higher this value is set, the more - debugging output is written to the server log. Values are from - 1 to 5. - - - - - - - - - Specifies the file system location of the data directory or - configuration file(s). See - for details. - - - - - - - - - Sets the default date style to European, that is - DMY ordering of input date fields. This also causes - the day to be printed before the month in certain date output formats. - See for more information. - - - - - - - - - Disables fsync calls for improved - performance, at the risk of data corruption in the event of a - system crash. Specifying this option is equivalent to - disabling the configuration - parameter. Read the detailed documentation before using this! - - - - has the opposite effect - of this option. - - - - - - - - - Specifies the IP host name or address on which the - postmaster is to listen for TCP/IP - connections from client applications. The value can also be a - comma-separated list of addresses, or * to specify - listening on all available interfaces. An empty value - specifies not listening on any IP addresses, in which case - only Unix-domain sockets can be used to connect to the - postmaster. Defaults to listening only on - localhost. - Specifying this option is equivalent to setting the configuration parameter. - - - - - - - - - Allows remote clients to connect via TCP/IP (Internet domain) - connections. Without this option, only local connections are - accepted. This option is equivalent to setting - listen_addresses to * in - postgresql.conf or via - - This option is deprecated since it does not allow access to the - full functionality of . - It's usually better to set listen_addresses directly. - - - - - - - - - Specifies the directory of the Unix-domain socket on which the - postmaster is to listen for - connections from client applications. The default is normally - /tmp, but can be changed at build time. - - - - - - - - - Enables secure connections using SSL. - PostgreSQL must have been compiled with - support for SSL for this option to be - available. For more information on using SSL, - refer to . - - - - - - - - - Sets the maximum number of client connections that this - postmaster will accept. By - default, this value is 32, but it can be set as high as your - system will support. (Note that - is required to be at least twice - . See for a discussion of - system resource requirements for large numbers of client - connections.) Specifying this option is equivalent to setting the - configuration parameter. - - - - - - - - - The command line-style options specified in extra-options are passed to - all server processes started by this - postmaster. See for possibilities. If the option - string contains any spaces, the entire string must be quoted. - - - - The use of this option is obsolete; all command-line options - for server processes can be specified directly on the - postmaster command line - - - - - - - - - Specifies the TCP/IP port or local Unix domain socket file - extension on which the postmaster - is to listen for connections from client applications. - Defaults to the value of the PGPORT environment - variable, or if PGPORT is not set, then - defaults to the value established during compilation (normally - 5432). If you specify a port other than the default port, - then all client applications must specify the same port using - either command-line options or PGPORT. - - - - - - - - - Print time information and other statistics at the end of each command. - This is useful for benchmarking or for use in tuning the number of - buffers. - - - - - - - - - Specifies that the postmaster - process should start up in silent mode. That is, it will - disassociate from the user's (controlling) terminal, start its - own process group, and redirect its standard output and - standard error to /dev/null. - - - Using this switch discards all logging output, which is - probably not what you want, since it makes it very difficult - to troubleshoot problems. See below for a better way to start - the postmaster in the background. - - - has the opposite effect - of this option. - - - - - - - - - Sets a named run-time parameter; a shorter form of - - - - - - - - - Semi-internal Options - - - There are several other options that may be specified, used - mainly for debugging purposes and in some cases to assist with - recovery of severely damaged databases. There should be no reason - to use them in a production database setup. These are listed - here only for the use by PostgreSQL - system developers. Use of any of these options is - highly discouraged. Furthermore, any of these options - may disappear or change in a future release without notice. - - - - - { s | i | m | n | h } - - - Forbids the use of particular scan and join methods: - s and i - disable sequential and index scans respectively, while - n, m, and h - disable nested-loop, merge and hash joins respectively. - - - - Neither sequential scans nor nested-loop joins can be disabled - completely; the -fs and - -fn options simply discourage the optimizer - from using those plan types if it has any other alternative. - - - - - - - - - This option is for debugging problems that cause a server - process to die abnormally. The ordinary strategy in this - situation is to notify all other server processes that they - must terminate and then reinitialize the shared memory and - semaphores. This is because an errant server process could - have corrupted some shared state before terminating. This - option specifies that the postmaster will - not reinitialize shared data structures. A knowledgeable - system programmer can then use a debugger to examine shared - memory and semaphore state. - - - - - - - - - Allows the structure of system tables to be modified. This is - used by initdb. - - - - - - - - - Ignore system indexes when reading system tables (but still update - the indexes when modifying the tables). This is useful when - recovering from damaged system indexes. - - - - - - pa[rser] | pl[anner] | e[xecutor] - - - Print timing statistics for each query relating to each of the - major system modules. This option cannot be used together - with the option. - - - - - - - - - This option is for debugging problems that cause a server - process to die abnormally. The ordinary strategy in this - situation is to notify all other server processes that they - must terminate and then reinitialize the shared memory and - semaphores. This is because an errant server process could - have corrupted some shared state before terminating. This - option specifies that the postmaster will - stop all other server processes by sending the signal - SIGSTOP, but will not cause them to - terminate. This permits system programmers to collect core - dumps from all server processes by hand. - - - - - - seconds - - - A delay of this many seconds occurs when a new server process - is started, after it conducts the authentication procedure. - This is intended to give an opportunity to attach to the - server process with a debugger. - - - - - - - - - Environment - - - - PGCLIENTENCODING - - - - Default character encoding used by clients. (The clients may - override this individually.) This value can also be set in the - configuration file. - - - - - - PGDATA - - - - Default data directory location - - - - - - PGDATESTYLE - - - - Default value of the run-time - parameter. (The use of this environment variable is deprecated.) - - - - - - PGPORT - - - - Default port (preferably set in the configuration file) - - - - - - TZ - - - - Server time zone - - - - - - - - - Diagnostics - - - A failure message mentioning semget or shmget - probably indicates you need to configure your kernel to provide adequate - shared memory and semaphores. For more discussion see . - - - - - You may be able to postpone reconfiguring your kernel by - decreasing to reduce the - shared memory consumption of PostgreSQL, and/or - by reducing to reduce the - semaphore consumption. - - - - - A failure message suggesting that another postmaster is already running - should be checked carefully, for example by using the command - -$ ps ax | grep postmaster - - or - -$ ps -ef | grep postmaster - - depending on your system. If you are certain that no conflicting - postmaster is running, you may remove the lock file mentioned in the - message and try again. - - - - A failure message indicating inability to bind to a port may - indicate that that port is already in use by some - non-PostgreSQL process. You may also - get this error if you terminate the postmaster - and immediately restart it using the same port; in this case, you - must simply wait a few seconds until the operating system closes - the port before trying again. Finally, you may get this error if - you specify a port number that your operating system considers to - be reserved. For example, many versions of Unix consider port - numbers under 1024 to be trusted and only permit - the Unix superuser to access them. - - - - - - Notes - - - If at all possible, do not use - SIGKILL to kill the - postmaster. Doing so will prevent - postmaster from freeing the system - resources (e.g., shared memory and semaphores) that it holds before - terminating. This may cause problems for starting a fresh - postmaster run. - - - - To terminate the postmaster normally, - the signals SIGTERM, SIGINT, - or SIGQUIT can be used. The first will wait for - all clients to terminate before quitting, the second will - forcefully disconnect all clients, and the third will quit - immediately without proper shutdown, resulting in a recovery run - during restart. The SIGHUP signal will - reload the server configuration files. - - - - The utility command can be used to - start and shut down the postmaster - safely and comfortably. - - - - The - - - - - Examples - - To start postmaster in the background - using default values, type: - - -$ nohup postmaster >logfile 2>&1 </dev/null & - - - - - To start postmaster with a specific - port: - -$ postmaster -p 1234 - - This command will start up postmaster - communicating through the port 1234. In order to connect to this - postmaster using psql, you would need to - run it as - -$ psql -p 1234 - - or set the environment variable PGPORT: - -$ export PGPORT=1234 -$ psql - - - - - Named run-time parameters can be set in either of these styles: - -$ postmaster -c work_mem=1234 -$ postmaster --work-mem=1234 - - Either form overrides whatever setting might exist for work_mem - in postgresql.conf. Notice that underscores in parameter - names can be written as either underscore or dash on the command line. - - - - - Except for short-term experiments, - it's probably better practice to edit the setting in - postgresql.conf than to rely on a command-line switch - to set a parameter. - - See Also - , - + - - diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 8c07d1caee..d589f9e82a 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -1,5 +1,5 @@ @@ -148,7 +148,7 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nam - One way to do this is to shut down the postmaster and start a stand-alone + One way to do this is to shut down the server and start a single-user PostgreSQL server with the option included on its command line. Then, REINDEX DATABASE, REINDEX SYSTEM, @@ -156,9 +156,9 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nam issued, depending on how much you want to reconstruct. If in doubt, use REINDEX SYSTEM to select reconstruction of all system indexes in the database. Then quit - the standalone server session and restart the regular server. + the single-user server session and restart the regular server. See the reference page for more - information about how to interact with the stand-alone server + information about how to interact with the single-user server interface. diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml index 843c13756b..f6123ba503 100644 --- a/doc/src/sgml/ref/show.sgml +++ b/doc/src/sgml/ref/show.sgml @@ -1,5 +1,5 @@ @@ -36,7 +36,7 @@ SHOW ALL the PGOPTIONS environmental variable (when using libpq or a libpq-based application), or through command-line flags when starting the - postmaster. See postgres. See for details. diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml index 0b5ddf4ac4..855c13a1ec 100644 --- a/doc/src/sgml/regress.sgml +++ b/doc/src/sgml/regress.sgml @@ -1,4 +1,4 @@ - + Regression Tests @@ -316,7 +316,7 @@ exclusion of those that don't. ]]> max_stack_depth]]> parameter indicates. This - can be fixed by running the postmaster under a higher stack + can be fixed by running the server under a higher stack size limit (4MB is recommended with the default value of max_stack_depth). If you are unable to do that, an alternative is to reduce the value of max_stack_depth. diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index a18914ac10..423311322a 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -1,4 +1,4 @@ - + Operating System Environment @@ -161,19 +161,19 @@ postgres$ initdb -D /usr/local/pgsql/data - + Starting the Database Server Before anyone can access the database, you must start the database server. The database server program is called - postmaster.postmaster - The postmaster must know where to + postgres.postgres + The postgres program must know where to find the data it is supposed to use. This is done with the option. Thus, the simplest way to start the server is: -$ postmaster -D /usr/local/pgsql/data +$ postgres -D /usr/local/pgsql/data which will leave the server running in the foreground. This must be done while logged into the PostgreSQL user @@ -183,10 +183,10 @@ $ postmaster -D /usr/local/pgsql/data - Normally it is better to start the postmaster in the + Normally it is better to start postgres in the background. For this, use the usual shell syntax: -$ postmaster -D /usr/local/pgsql/data >logfile 2>&1 & +$ postgres -D /usr/local/pgsql/data >logfile 2>&1 & It is important to store the server's stdout and stderr output somewhere, as shown above. It will help @@ -196,9 +196,9 @@ $ postmaster -D /usr/local/pgsql/data >logfile 2>&1 & - The postmaster also takes a number of other - command line options. For more information, see the - reference page + The postgres program also takes a number of other + command-line options. For more information, see the + reference page and below. @@ -212,7 +212,7 @@ pg_ctl start -l logfile will start the server in the background and put the output into the named log file. The option has the same meaning - here as in the postmaster. pg_ctl + here as for postgres. pg_ctl is also capable of stopping the server. @@ -262,7 +262,7 @@ su -c 'pg_ctl start -D /usr/local/pgsql/data -l serverlog' postgres to the file /etc/rc.local: OpenBSDstart script -if [ -x /usr/local/pgsql/bin/pg_ctl -a -x /usr/local/pgsql/bin/postmaster ]; then +if [ -x /usr/local/pgsql/bin/pg_ctl -a -x /usr/local/pgsql/bin/postgres ]; then su - -c '/usr/local/pgsql/bin/pg_ctl start -l /var/postgresql/log -s' postgres echo -n ' postgresql' fi @@ -310,15 +310,15 @@ su - postgres -c "/usr/local/pgsql/bin/pg_ctl start -l logfile -D /usr/local/pgs - While the postmaster is running, its + While the server is running, its PID is stored in the file postmaster.pid in the data directory. This is - used to prevent multiple postmaster processes + used to prevent multiple server instances from running in the same data directory and can also be used for - shutting down the postmaster process. + shutting down the server. - + Server Start-up Failures @@ -336,13 +336,13 @@ HINT: Is another postmaster already running on port 5432? If not, wait a few se FATAL: could not create TCP/IP listen socket This usually means just what it suggests: you tried to start - another postmaster on the same port where one is already running. + another server on the same port where one is already running. However, if the kernel error message is not Address already in use or some variant of that, there may - be a different problem. For example, trying to start a postmaster + be a different problem. For example, trying to start a server on a reserved port number may draw something like: -$ postmaster -p 666 +$ postgres -p 666 LOG: could not bind IPv4 socket: Permission denied HINT: Is another postmaster already running on port 666? If not, wait a few seconds and retry. FATAL: could not create TCP/IP listen socket @@ -495,7 +495,7 @@ psql: could not connect to server: No such file or directory IPC limits, the server will refuse to start and should leave an instructive error message describing the problem encountered and what to do about it. (See also .) The relevant kernel + linkend="server-start-failures">.) The relevant kernel parameters are named consistently across different systems; gives an overview. The methods to set them, however, vary. Suggestions for some platforms are given below. @@ -1181,7 +1181,7 @@ default:\ optimal for PostgreSQL. Because of the way that the kernel implements memory overcommit, the kernel may terminate the PostgreSQL server (the - postmaster process) if the memory demands of + master server process) if the memory demands of another process cause the system to run out of virtual memory. @@ -1190,9 +1190,9 @@ default:\ this (consult your system documentation and configuration on where to look for such a message): -Out of Memory: Killed process 12345 (postmaster). +Out of Memory: Killed process 12345 (postgres). - This indicates that the postmaster process + This indicates that the postgres process has been terminated due to memory pressure. Although existing database connections will continue to function normally, no new connections will be accepted. To recover, @@ -1237,17 +1237,17 @@ sysctl -w vm.overcommit_memory=2 - + Shutting Down the Server - + shutdown There are several ways to shut down the database server. You control - the type of shutdown by sending different signals to the - postmaster process. + the type of shutdown by sending different signals to the master + postgres process. @@ -1281,7 +1281,7 @@ sysctl -w vm.overcommit_memory=2 This is the Immediate Shutdown, which - will cause the postmaster process to send a + will cause the master postgres process to send a SIGQUIT to all child processes and exit immediately, without properly shutting itself down. The child processes likewise exit immediately upon receiving @@ -1301,7 +1301,7 @@ sysctl -w vm.overcommit_memory=2 Alternatively, you can send the signal directly using kill. - The PID of the postmaster process can be + The PID of the postgres process can be found using the ps program, or from the file postmaster.pid in the data directory. For example, to do a fast shutdown: @@ -1316,7 +1316,7 @@ $ kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`SIGKILL kills the postmaster + SIGKILL kills the postgres process without letting it relay the signal to its subprocesses, so it will be necessary to kill the individual subprocesses by hand as well. diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml index b374a0db4c..c892699e71 100644 --- a/doc/src/sgml/start.sgml +++ b/doc/src/sgml/start.sgml @@ -1,4 +1,4 @@ - + Getting Started @@ -76,8 +76,8 @@ connections to the database from client applications, and performs actions on the database on behalf of the clients. The database server program is called - postmaster. - postmaster + postgres. + postgres @@ -112,8 +112,8 @@ starts (forks) a new process for each connection. From that point on, the client and the new server process communicate without intervention by the original - postmaster process. Thus, the - postmaster is always running, waiting for + postgres process. Thus, the + master server process is always running, waiting for client connections, whereas client and associated server processes come and go. (All of this is of course invisible to the user. We only mention it here for completeness.) diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml index 5430be9ad2..ae1a11d52b 100644 --- a/doc/src/sgml/storage.sgml +++ b/doc/src/sgml/storage.sgml @@ -1,4 +1,4 @@ - + @@ -23,7 +23,7 @@ All the data needed for a database cluster is stored within the cluster's data directory, commonly referred to as PGDATA (after the name of the environment variable that can be used to define it). A common location for PGDATA is /var/lib/pgsql/data. Multiple clusters, -managed by different postmasters, can exist on the same machine. +managed by different server instances, can exist on the same machine. @@ -99,14 +99,14 @@ Item postmaster.opts - A file recording the command-line options the postmaster was + A file recording the command-line options the server was last started with postmaster.pid - A lock file recording the current postmaster PID and shared memory -segment ID (not present after postmaster shutdown) + A lock file recording the current server PID and shared memory +segment ID (not present after server shutdown) diff --git a/src/backend/Makefile b/src/backend/Makefile index e97e7b33aa..eeead6c026 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -4,11 +4,11 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/Makefile,v 1.114 2006/01/05 01:56:29 momjian Exp $ +# $PostgreSQL: pgsql/src/backend/Makefile,v 1.115 2006/06/18 15:38:36 petere Exp $ # #------------------------------------------------------------------------- -PGFILEDESC = "PostgreSQL Database Backend" +PGFILEDESC = "PostgreSQL Server" subdir = src/backend top_builddir = ../.. include $(top_builddir)/src/Makefile.global diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index bc60d533ae..8acac3ad44 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.216 2006/06/08 23:55:48 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.217 2006/06/18 15:38:36 petere Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,6 @@ extern char *optarg; #define ALLOC(t, c) ((t *) calloc((unsigned)(c), sizeof(t))) -static void usage(void); static void bootstrap_signals(void); static void ShutdownDummyProcess(int code, Datum arg); static hashnode *AddStr(char *str, int strlength, int mderef); @@ -247,8 +246,8 @@ BootstrapMain(int argc, char *argv[]) if (!IsUnderPostmaster) InitializeGUCOptions(); - /* Ignore the initial -boot argument, if present */ - if (argc > 1 && strcmp(argv[1], "-boot") == 0) + /* Ignore the initial --boot argument, if present */ + if (argc > 1 && strcmp(argv[1], "--boot") == 0) { argv++; argc--; @@ -317,7 +316,9 @@ BootstrapMain(int argc, char *argv[]) break; } default: - usage(); + write_stderr("Try \"%s --help\" for more information.\n", + progname); + proc_exit(1); break; } } @@ -328,7 +329,10 @@ BootstrapMain(int argc, char *argv[]) optind++; } if (!dbname || argc != optind) - usage(); + { + write_stderr("%s: invalid command-line arguments\n", progname); + proc_exit(1); + } /* * Identify myself via ps @@ -498,26 +502,6 @@ BootstrapMain(int argc, char *argv[]) * ---------------------------------------------------------------- */ -/* usage: - * usage help for the bootstrap backend - */ -static void -usage(void) -{ - fprintf(stderr, _("This is the PostgreSQL bootstrap process.\n\n")); - fprintf(stderr, _("Usage:\n postgres -boot [OPTION]... DBNAME\n\n")); - fprintf(stderr, _("Options:\n")); - fprintf(stderr, _(" -B NBUFFERS number of shared buffers\n")); - fprintf(stderr, _(" -c NAME=VALUE set run-time parameter\n")); - fprintf(stderr, _(" -d 1-5 debugging level\n")); - fprintf(stderr, _(" -D DATADIR database directory\n")); - fprintf(stderr, _(" -F turn fsync off\n")); - fprintf(stderr, _(" -r FILENAME send stdout and stderr to given file\n")); - fprintf(stderr, _(" -x NUM internal use\n")); - - proc_exit(1); -} - /* * Set up signal handling for a bootstrap process */ diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 37b7720634..60c46d39a2 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.102 2006/06/12 16:17:20 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.103 2006/06/18 15:38:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,7 @@ #include #undef ASSEMBLER #endif + #if defined(__NetBSD__) #include #endif @@ -45,88 +46,26 @@ #include "libpq/pqsignal.h" #endif + const char *progname; + +static void startup_hacks(const char *progname); +static void help(const char *progname); +static void check_root(const char *progname); +static char *get_current_username(const char *progname); + + + int main(int argc, char *argv[]) { -#ifndef WIN32 - struct passwd *pw; -#endif - char *pw_name_persist; - - /* - * Place platform-specific startup hacks here. This is the right place to - * put code that must be executed early in launch of either a postmaster, - * a standalone backend, or a standalone bootstrap run. Note that this - * code will NOT be executed when a backend or sub-bootstrap run is forked - * by the postmaster. - * - * XXX The need for code here is proof that the platform in question is - * too brain-dead to provide a standard C execution environment without - * help. Avoid adding more here, if you can. - */ - -#if defined(__alpha) /* no __alpha__ ? */ -#ifdef NOFIXADE - int buffer[] = {SSIN_UACPROC, UAC_SIGBUS | UAC_NOPRINT}; -#endif -#endif /* __alpha */ - -#ifdef WIN32 - char *env_locale; -#endif - progname = get_progname(argv[0]); /* - * On some platforms, unaligned memory accesses result in a kernel trap; - * the default kernel behavior is to emulate the memory access, but this - * results in a significant performance penalty. We ought to fix PG not to - * make such unaligned memory accesses, so this code disables the kernel - * emulation: unaligned accesses will result in SIGBUS instead. - */ -#ifdef NOFIXADE - -#if defined(ultrix4) - syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL); -#endif - -#if defined(__alpha) /* no __alpha__ ? */ - if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL, - (unsigned long) NULL) < 0) - write_stderr("%s: setsysinfo failed: %s\n", - argv[0], strerror(errno)); -#endif -#endif /* NOFIXADE */ - -#if defined(WIN32) - { - WSADATA wsaData; - int err; - - /* Make output streams unbuffered by default */ - setvbuf(stdout, NULL, _IONBF, 0); - setvbuf(stderr, NULL, _IONBF, 0); - - /* Prepare Winsock */ - err = WSAStartup(MAKEWORD(2, 2), &wsaData); - if (err != 0) - { - write_stderr("%s: WSAStartup failed: %d\n", - argv[0], err); - exit(1); - } - - /* In case of general protection fault, don't show GUI popup box */ - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); - } -#endif - - /* - * Not-quite-so-platform-specific startup environment checks. Still best - * to minimize these. + * Platform-specific startup hacks */ + startup_hacks(progname); /* * Remember the physical location of the initially given argv[] array for @@ -153,23 +92,25 @@ main(int argc, char *argv[]) set_pglocale_pgservice(argv[0], "postgres"); #ifdef WIN32 - /* * Windows uses codepages rather than the environment, so we work around * that by querying the environment explicitly first for LC_COLLATE and * LC_CTYPE. We have to do this because initdb passes those values in the * environment. If there is nothing there we fall back on the codepage. */ + { + char *env_locale; - if ((env_locale = getenv("LC_COLLATE")) != NULL) - pg_perm_setlocale(LC_COLLATE, env_locale); - else - pg_perm_setlocale(LC_COLLATE, ""); + if ((env_locale = getenv("LC_COLLATE")) != NULL) + pg_perm_setlocale(LC_COLLATE, env_locale); + else + pg_perm_setlocale(LC_COLLATE, ""); - if ((env_locale = getenv("LC_CTYPE")) != NULL) - pg_perm_setlocale(LC_CTYPE, env_locale); - else - pg_perm_setlocale(LC_CTYPE, ""); + if ((env_locale = getenv("LC_CTYPE")) != NULL) + pg_perm_setlocale(LC_CTYPE, env_locale); + else + pg_perm_setlocale(LC_CTYPE, ""); + } #else pg_perm_setlocale(LC_COLLATE, ""); pg_perm_setlocale(LC_CTYPE, ""); @@ -195,80 +136,38 @@ main(int argc, char *argv[]) unsetenv("LC_ALL"); /* - * Skip permission checks if we're just trying to do --help or --version; - * otherwise root will get unhelpful failure messages from initdb. + * Catch standard options before doing much else */ - if (!(argc > 1 - && (strcmp(argv[1], "--help") == 0 || - strcmp(argv[1], "-?") == 0 || - strcmp(argv[1], "--version") == 0 || - strcmp(argv[1], "-V") == 0))) + if (argc > 1) { -#ifndef WIN32 - /* - * Make sure we are not running as root. - */ - if (geteuid() == 0) + if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) { - write_stderr("\"root\" execution of the PostgreSQL server is not permitted.\n" - "The server must be started under an unprivileged user ID to prevent\n" - "possible system security compromise. See the documentation for\n" - "more information on how to properly start the server.\n"); - exit(1); + help(progname); + exit(0); } - - /* - * Also make sure that real and effective uids are the same. Executing - * Postgres as a setuid program from a root shell is a security hole, - * since on many platforms a nefarious subroutine could setuid back to - * root if real uid is root. (Since nobody actually uses Postgres as - * a setuid program, trying to actively fix this situation seems more - * trouble than it's worth; we'll just expend the effort to check for - * it.) - */ - if (getuid() != geteuid()) + if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - write_stderr("%s: real and effective user IDs must match\n", - argv[0]); - exit(1); + puts("postgres (PostgreSQL) " PG_VERSION); + exit(0); } -#else /* WIN32 */ - if (pgwin32_is_admin()) - { - write_stderr("Execution of PostgreSQL by a user with administrative permissions is not\n" - "permitted.\n" - "The server must be started under an unprivileged user ID to prevent\n" - "possible system security compromises. See the documentation for\n" - "more information on how to properly start the server.\n"); - exit(1); - } -#endif /* !WIN32 */ } /* - * Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain, - * SubPostmasterMain, or BootstrapMain depending on the program name (and - * possibly first argument) we were called with. The lack of consistency - * here is historical. + * Make sure we are not running as root. */ - if (strcmp(progname, "postmaster") == 0) - { - /* Called as "postmaster" */ - exit(PostmasterMain(argc, argv)); - } + check_root(progname); /* - * If the first argument begins with "-fork", then invoke - * SubPostmasterMain. This is used for forking postmaster child processes - * on systems where we can't simply fork. + * Dispatch to one of various subprograms depending on first + * argument. */ + #ifdef EXEC_BACKEND - if (argc > 1 && strncmp(argv[1], "-fork", 5) == 0) + if (argc > 1 && strncmp(argv[1], "--fork", 6) == 0) exit(SubPostmasterMain(argc, argv)); #endif #ifdef WIN32 - /* * Start our win32 signal implementation * @@ -278,47 +177,223 @@ main(int argc, char *argv[]) pgwin32_signal_initialize(); #endif - /* - * If the first argument is "-boot", then invoke bootstrap mode. (This - * path is taken only for a standalone bootstrap process.) - */ - if (argc > 1 && strcmp(argv[1], "-boot") == 0) + if (argc > 1 && strcmp(argv[1], "--boot") == 0) exit(BootstrapMain(argc, argv)); - /* - * If the first argument is "--describe-config", then invoke runtime - * configuration option display mode. - */ if (argc > 1 && strcmp(argv[1], "--describe-config") == 0) exit(GucInfoMain()); + if (argc > 1 && strcmp(argv[1], "--single") == 0) + exit(PostgresMain(argc, argv, get_current_username(progname))); + + exit(PostmasterMain(argc, argv)); +} + + + +/* + * Place platform-specific startup hacks here. This is the right + * place to put code that must be executed early in launch of either a + * postmaster, a standalone backend, or a standalone bootstrap run. + * Note that this code will NOT be executed when a backend or + * sub-bootstrap run is forked by the server. + * + * XXX The need for code here is proof that the platform in question + * is too brain-dead to provide a standard C execution environment + * without help. Avoid adding more here, if you can. + */ +static void +startup_hacks(const char *progname) +{ +#if defined(__alpha) /* no __alpha__ ? */ +#ifdef NOFIXADE + int buffer[] = {SSIN_UACPROC, UAC_SIGBUS | UAC_NOPRINT}; +#endif +#endif /* __alpha */ + + /* - * Otherwise we're a standalone backend. Invoke PostgresMain, specifying - * current userid as the "authenticated" Postgres user name. + * On some platforms, unaligned memory accesses result in a kernel + * trap; the default kernel behavior is to emulate the memory + * access, but this results in a significant performance penalty. + * We ought to fix PG not to make such unaligned memory accesses, + * so this code disables the kernel emulation: unaligned accesses + * will result in SIGBUS instead. */ +#ifdef NOFIXADE + +#if defined(ultrix4) + syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL); +#endif + +#if defined(__alpha) /* no __alpha__ ? */ + if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL, + (unsigned long) NULL) < 0) + write_stderr("%s: setsysinfo failed: %s\n", + progname, strerror(errno)); +#endif + +#endif /* NOFIXADE */ + + +#ifdef WIN32 + { + WSADATA wsaData; + int err; + + /* Make output streams unbuffered by default */ + setvbuf(stdout, NULL, _IONBF, 0); + setvbuf(stderr, NULL, _IONBF, 0); + + /* Prepare Winsock */ + err = WSAStartup(MAKEWORD(2, 2), &wsaData); + if (err != 0) + { + write_stderr("%s: WSAStartup failed: %d\n", + progname, err); + exit(1); + } + + /* In case of general protection fault, don't show GUI popup box */ + SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); + } +#endif /* WIN32 */ +} + + + +static void +help(const char *progname) +{ + printf(_("%s is the PostgreSQL server.\n\n"), progname); + printf(_("Usage:\n %s [OPTION]...\n\n"), progname); + printf(_("Options:\n")); +#ifdef USE_ASSERT_CHECKING + printf(_(" -A 1|0 enable/disable run-time assert checking\n")); +#endif + printf(_(" -B NBUFFERS number of shared buffers\n")); + printf(_(" -c NAME=VALUE set run-time parameter\n")); + printf(_(" -d 1-5 debugging level\n")); + printf(_(" -D DATADIR database directory\n")); + printf(_(" -e use European date input format (DMY)\n")); + printf(_(" -F turn fsync off\n")); + printf(_(" -h HOSTNAME host name or IP address to listen on\n")); + printf(_(" -i enable TCP/IP connections\n")); + printf(_(" -k DIRECTORY Unix-domain socket location\n")); +#ifdef USE_SSL + printf(_(" -l enable SSL connections\n")); +#endif + printf(_(" -N MAX-CONNECT maximum number of allowed connections\n")); + printf(_(" -o OPTIONS pass \"OPTIONS\" to each server process (obsolete)\n")); + printf(_(" -p PORT port number to listen on\n")); + printf(_(" -s show statistics after each query\n")); + printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n")); + printf(_(" --NAME=VALUE set run-time parameter\n")); + printf(_(" --describe-config describe configuration parameters, then exit\n")); + printf(_(" --help show this help, then exit\n")); + printf(_(" --version output version information, then exit\n")); + + printf(_("\nDeveloper options:\n")); + printf(_(" -f s|i|n|m|h forbid use of some plan types\n")); + printf(_(" -n do not reinitialize shared memory after abnormal exit\n")); + printf(_(" -O allow system table structure changes\n")); + printf(_(" -P disable system indexes\n")); + printf(_(" -t pa|pl|ex show timings after each query\n")); + printf(_(" -T send SIGSTOP to all backend servers if one dies\n")); + printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n")); + + printf(_("\nOptions for single-user mode:\n")); + printf(_(" --single selects single-user mode (must be first argument)\n")); + printf(_(" DBNAME database name (defaults to user name)\n")); + printf(_(" -d 0-5 override debugging level\n")); + printf(_(" -E echo statement before execution\n")); + printf(_(" -j do not use newline as interactive query delimiter\n")); + printf(_(" -r FILENAME send stdout and stderr to given file\n")); + + printf(_("\nOptions for bootstrapping mode:\n")); + printf(_(" --boot selects bootstrapping mode (must be first argument)\n")); + printf(_(" DBNAME database name (mandatory argument in bootstrapping mode)\n")); + printf(_(" -r FILENAME send stdout and stderr to given file\n")); + printf(_(" -x NUM internal use\n")); + + printf(_("\nPlease read the documentation for the complete list of run-time\n" + "configuration settings and how to set them on the command line or in\n" + "the configuration file.\n\n" + "Report bugs to .\n")); +} + + + +static void +check_root(const char *progname) +{ #ifndef WIN32 + if (geteuid() == 0) + { + write_stderr("\"root\" execution of the PostgreSQL server is not permitted.\n" + "The server must be started under an unprivileged user ID to prevent\n" + "possible system security compromise. See the documentation for\n" + "more information on how to properly start the server.\n"); + exit(1); + } + + /* + * Also make sure that real and effective uids are the same. + * Executing as a setuid program from a root shell is a security + * hole, since on many platforms a nefarious subroutine could + * setuid back to root if real uid is root. (Since nobody + * actually uses postgres as a setuid program, trying to + * actively fix this situation seems more trouble than it's worth; + * we'll just expend the effort to check for it.) + */ + if (getuid() != geteuid()) + { + write_stderr("%s: real and effective user IDs must match\n", + progname); + exit(1); + } +#else /* WIN32 */ + if (pgwin32_is_admin()) + { + write_stderr("Execution of PostgreSQL by a user with administrative permissions is not\n" + "permitted.\n" + "The server must be started under an unprivileged user ID to prevent\n" + "possible system security compromises. See the documentation for\n" + "more information on how to properly start the server.\n"); + exit(1); + } +#endif /* WIN32 */ +} + + + +static char * +get_current_username(const char *progname) +{ +#ifndef WIN32 + struct passwd *pw; + pw = getpwuid(geteuid()); if (pw == NULL) { write_stderr("%s: invalid effective UID: %d\n", - argv[0], (int) geteuid()); + progname, (int) geteuid()); exit(1); } - /* Allocate new memory because later getpwuid() calls can overwrite it */ - pw_name_persist = strdup(pw->pw_name); + /* Allocate new memory because later getpwuid() calls can overwrite it. */ + return strdup(pw->pw_name); #else + long namesize = 256 /* UNLEN */ + 1; + char *name; + + name = malloc(namesize); + if (!GetUserName(name, &namesize)) { - long namesize = 256 /* UNLEN */ + 1; - - pw_name_persist = malloc(namesize); - if (!GetUserName(pw_name_persist, &namesize)) - { - write_stderr("%s: could not determine user name (GetUserName failed)\n", - argv[0]); - exit(1); - } + write_stderr("%s: could not determine user name (GetUserName failed)\n", + progname); + exit(1); } -#endif /* WIN32 */ - exit(PostgresMain(argc, argv, pw_name_persist)); + return name; +#endif } diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 820f445866..93ba5c2c98 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.19 2006/05/19 15:15:37 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.20 2006/06/18 15:38:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -208,7 +208,7 @@ autovac_forkexec(void) int ac = 0; av[ac++] = "postgres"; - av[ac++] = "-forkautovac"; + av[ac++] = "--forkautovac"; av[ac++] = NULL; /* filled in by postmaster_forkexec */ av[ac] = NULL; diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index 9a8f24e5db..538ba0c3ec 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.22 2006/05/30 17:08:14 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.23 2006/06/18 15:38:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -197,7 +197,7 @@ pgarch_forkexec(void) av[ac++] = "postgres"; - av[ac++] = "-forkarch"; + av[ac++] = "--forkarch"; av[ac++] = NULL; /* filled in by postmaster_forkexec */ diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index df28661402..50486f8cef 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.127 2006/05/30 02:35:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.128 2006/06/18 15:38:37 petere Exp $ * ---------- */ #include "postgres.h" @@ -491,11 +491,11 @@ pgstat_forkexec(STATS_PROCESS_TYPE procType) switch (procType) { case STAT_PROC_BUFFER: - av[ac++] = "-forkbuf"; + av[ac++] = "--forkbuf"; break; case STAT_PROC_COLLECTOR: - av[ac++] = "-forkcol"; + av[ac++] = "--forkcol"; break; default: diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 0fa564a8f5..fc4a9bcdc3 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.485 2006/06/07 22:24:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.486 2006/06/18 15:38:37 petere Exp $ * * NOTES * @@ -266,7 +266,6 @@ static void LogChildExit(int lev, const char *procname, static void BackendInitialize(Port *port); static int BackendRun(Port *port); static void ExitPostmaster(int status); -static void usage(const char *); static int ServerLoop(void); static int BackendStartup(Port *port); static int ProcessStartupPacket(Port *port, bool SSLdone); @@ -384,29 +383,6 @@ PostmasterMain(int argc, char *argv[]) IsPostmasterEnvironment = true; - /* - * Catch standard options before doing much else. This even works on - * systems without getopt_long. - */ - if (argc > 1) - { - if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) - { - usage(progname); - ExitPostmaster(0); - } - if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) - { - puts("postmaster (PostgreSQL) " PG_VERSION); - ExitPostmaster(0); - } - } - -#ifdef WIN32 - /* Start our win32 signal implementation */ - pgwin32_signal_initialize(); -#endif - /* * for security, no dir or file created can be group or other accessible */ @@ -1133,55 +1109,6 @@ pmdaemonize(void) } -/* - * Print out help message - */ -static void -usage(const char *progname) -{ - printf(_("%s is the PostgreSQL server.\n\n"), progname); - printf(_("Usage:\n %s [OPTION]...\n\n"), progname); - printf(_("Options:\n")); -#ifdef USE_ASSERT_CHECKING - printf(_(" -A 1|0 enable/disable run-time assert checking\n")); -#endif - printf(_(" -B NBUFFERS number of shared buffers\n")); - printf(_(" -c NAME=VALUE set run-time parameter\n")); - printf(_(" -d 1-5 debugging level\n")); - printf(_(" -D DATADIR database directory\n")); - printf(_(" -e use European date input format (DMY)\n")); - printf(_(" -F turn fsync off\n")); - printf(_(" -h HOSTNAME host name or IP address to listen on\n")); - printf(_(" -i enable TCP/IP connections\n")); - printf(_(" -k DIRECTORY Unix-domain socket location\n")); -#ifdef USE_SSL - printf(_(" -l enable SSL connections\n")); -#endif - printf(_(" -N MAX-CONNECT maximum number of allowed connections\n")); - printf(_(" -o OPTIONS pass \"OPTIONS\" to each server process (obsolete)\n")); - printf(_(" -p PORT port number to listen on\n")); - printf(_(" -s show statistics after each query\n")); - printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n")); - printf(_(" --NAME=VALUE set run-time parameter\n")); - printf(_(" --help show this help, then exit\n")); - printf(_(" --version output version information, then exit\n")); - - printf(_("\nDeveloper options:\n")); - printf(_(" -f s|i|n|m|h forbid use of some plan types\n")); - printf(_(" -n do not reinitialize shared memory after abnormal exit\n")); - printf(_(" -O allow system table structure changes\n")); - printf(_(" -P disable system indexes\n")); - printf(_(" -t pa|pl|ex show timings after each query\n")); - printf(_(" -T send SIGSTOP to all backend servers if one dies\n")); - printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n")); - - printf(_("\nPlease read the documentation for the complete list of run-time\n" - "configuration settings and how to set them on the command line or in\n" - "the configuration file.\n\n" - "Report bugs to .\n")); -} - - /* * Main idle loop of postmaster */ @@ -2957,7 +2884,7 @@ backend_forkexec(Port *port) int ac = 0; av[ac++] = "postgres"; - av[ac++] = "-forkbackend"; + av[ac++] = "--forkbackend"; av[ac++] = NULL; /* filled in by internal_forkexec */ av[ac] = NULL; @@ -3030,10 +2957,10 @@ internal_forkexec(int argc, char *argv[], Port *port) /* Make sure caller set up argv properly */ Assert(argc >= 3); Assert(argv[argc] == NULL); - Assert(strncmp(argv[1], "-fork", 5) == 0); + Assert(strncmp(argv[1], "--fork", 6) == 0); Assert(argv[2] == NULL); - /* Insert temp file name after -fork argument */ + /* Insert temp file name after --fork argument */ argv[2] = tmpfilename; /* Fire off execv in child */ @@ -3081,7 +3008,7 @@ internal_forkexec(int argc, char *argv[], Port *port) /* Make sure caller set up argv properly */ Assert(argc >= 3); Assert(argv[argc] == NULL); - Assert(strncmp(argv[1], "-fork", 5) == 0); + Assert(strncmp(argv[1], "--fork", 6) == 0); Assert(argv[2] == NULL); /* Verify that there is room in the child list */ @@ -3119,7 +3046,7 @@ internal_forkexec(int argc, char *argv[], Port *port) return -1; } - /* Insert temp file name after -fork argument */ + /* Insert temp file name after --fork argument */ sprintf(paramHandleStr, "%lu", (DWORD) paramHandle); argv[2] = paramHandleStr; @@ -3242,7 +3169,7 @@ internal_forkexec(int argc, char *argv[], Port *port) * to what it would be if we'd simply forked on Unix, and then * dispatch to the appropriate place. * - * The first two command line arguments are expected to be "-forkFOO" + * The first two command line arguments are expected to be "--forkFOO" * (where FOO indicates which postmaster child we are to become), and * the name of a variables file that we can read to load data that would * have been inherited by fork() on Unix. Remaining arguments go to the @@ -3282,9 +3209,9 @@ SubPostmasterMain(int argc, char *argv[]) * to do this before going any further to ensure that we can attach at the * same address the postmaster used. */ - if (strcmp(argv[1], "-forkbackend") == 0 || - strcmp(argv[1], "-forkautovac") == 0 || - strcmp(argv[1], "-forkboot") == 0) + if (strcmp(argv[1], "--forkbackend") == 0 || + strcmp(argv[1], "--forkautovac") == 0 || + strcmp(argv[1], "--forkboot") == 0) PGSharedMemoryReAttach(); /* @@ -3304,7 +3231,7 @@ SubPostmasterMain(int argc, char *argv[]) read_nondefault_variables(); /* Run backend or appropriate child */ - if (strcmp(argv[1], "-forkbackend") == 0) + if (strcmp(argv[1], "--forkbackend") == 0) { Assert(argc == 3); /* shouldn't be any more args */ @@ -3356,7 +3283,7 @@ SubPostmasterMain(int argc, char *argv[]) /* And run the backend */ proc_exit(BackendRun(&port)); } - if (strcmp(argv[1], "-forkboot") == 0) + if (strcmp(argv[1], "--forkboot") == 0) { /* Close the postmaster's sockets */ ClosePostmasterPorts(false); @@ -3373,7 +3300,7 @@ SubPostmasterMain(int argc, char *argv[]) BootstrapMain(argc - 2, argv + 2); proc_exit(0); } - if (strcmp(argv[1], "-forkautovac") == 0) + if (strcmp(argv[1], "--forkautovac") == 0) { /* Close the postmaster's sockets */ ClosePostmasterPorts(false); @@ -3390,7 +3317,7 @@ SubPostmasterMain(int argc, char *argv[]) AutoVacMain(argc - 2, argv + 2); proc_exit(0); } - if (strcmp(argv[1], "-forkarch") == 0) + if (strcmp(argv[1], "--forkarch") == 0) { /* Close the postmaster's sockets */ ClosePostmasterPorts(false); @@ -3400,7 +3327,7 @@ SubPostmasterMain(int argc, char *argv[]) PgArchiverMain(argc, argv); proc_exit(0); } - if (strcmp(argv[1], "-forkbuf") == 0) + if (strcmp(argv[1], "--forkbuf") == 0) { /* Close the postmaster's sockets */ ClosePostmasterPorts(false); @@ -3410,7 +3337,7 @@ SubPostmasterMain(int argc, char *argv[]) PgstatBufferMain(argc, argv); proc_exit(0); } - if (strcmp(argv[1], "-forkcol") == 0) + if (strcmp(argv[1], "--forkcol") == 0) { /* * Do NOT close postmaster sockets here, because we are forking from @@ -3422,7 +3349,7 @@ SubPostmasterMain(int argc, char *argv[]) PgstatCollectorMain(argc, argv); proc_exit(0); } - if (strcmp(argv[1], "-forklog") == 0) + if (strcmp(argv[1], "--forklog") == 0) { /* Close the postmaster's sockets */ ClosePostmasterPorts(true); @@ -3635,7 +3562,7 @@ StartChildProcess(int xlop) av[ac++] = "postgres"; #ifdef EXEC_BACKEND - av[ac++] = "-forkboot"; + av[ac++] = "--forkboot"; av[ac++] = NULL; /* filled in by postmaster_forkexec */ #endif diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 339f4605af..899dcad1f7 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -18,7 +18,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.24 2006/06/07 22:24:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.25 2006/06/18 15:38:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -534,7 +534,7 @@ syslogger_forkexec(void) char numbuf[2][32]; av[ac++] = "postgres"; - av[ac++] = "-forklog"; + av[ac++] = "--forklog"; av[ac++] = NULL; /* filled in by postmaster_forkexec */ /* static variables (those not passed by write_backend_variables) */ diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index a43478088f..b7c363d80c 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.487 2006/06/11 15:49:28 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.488 2006/06/18 15:38:37 petere Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2399,41 +2399,6 @@ assign_max_stack_depth(int newval, bool doit, GucSource source) } -static void -usage(const char *progname) -{ - printf(_("%s is the PostgreSQL stand-alone backend. It is not\nintended to be used by normal users.\n\n"), progname); - - printf(_("Usage:\n %s [OPTION]... DBNAME\n\n"), progname); - printf(_("Options:\n")); -#ifdef USE_ASSERT_CHECKING - printf(_(" -A 1|0 enable/disable run-time assert checking\n")); -#endif - printf(_(" -B NBUFFERS number of shared buffers\n")); - printf(_(" -c NAME=VALUE set run-time parameter\n")); - printf(_(" -d 0-5 debugging level\n")); - printf(_(" -D DATADIR database directory\n")); - printf(_(" -e use European date input format (DMY)\n")); - printf(_(" -E echo statement before execution\n")); - printf(_(" -F turn fsync off\n")); - printf(_(" -j do not use newline as interactive query delimiter\n")); - printf(_(" -r FILENAME send stdout and stderr to given file\n")); - printf(_(" -s show statistics after each query\n")); - printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n")); - printf(_(" --NAME=VALUE set run-time parameter\n")); - printf(_(" --describe-config describe configuration parameters, then exit\n")); - printf(_(" --help show this help, then exit\n")); - printf(_(" --version output version information, then exit\n")); - printf(_("\nDeveloper options:\n")); - printf(_(" -f s|i|n|m|h forbid use of some plan types\n")); - printf(_(" -O allow system table structure changes\n")); - printf(_(" -P disable system indexes\n")); - printf(_(" -t pa|pl|ex show timings after each query\n")); - printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n")); - printf(_("\nReport bugs to .\n")); -} - - /* * set_debug_options --- apply "-d N" command line option * @@ -2563,24 +2528,6 @@ PostgresMain(int argc, char *argv[], const char *username) (guc_names = lappend(guc_names, pstrdup(name)), \ guc_values = lappend(guc_values, pstrdup(val))) - /* - * Catch standard options before doing much else. This even works on - * systems without getopt_long. - */ - if (!IsUnderPostmaster && argc > 1) - { - if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) - { - usage(argv[0]); - exit(0); - } - if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) - { - puts(PG_VERSIONSTR); - exit(0); - } - } - /* * initialize globals (already done if under postmaster, but not if * standalone; cheap enough to do over) @@ -2638,6 +2585,13 @@ PostgresMain(int argc, char *argv[], const char *username) * ---------------- */ + /* Ignore the initial --single argument, if present */ + if (argc > 1 && strcmp(argv[1], "--single") == 0) + { + argv++; + argc--; + } + /* all options are allowed until '-p' */ secure = true; ctx = PGC_POSTMASTER; diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 343f428ddd..89c496ee2e 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -4,7 +4,7 @@ * * initdb creates (initializes) a PostgreSQL database cluster (site, * instance, installation, whatever). A database cluster is a - * collection of PostgreSQL databases all managed by the same postmaster. + * collection of PostgreSQL databases all managed by the same server. * * To create the database cluster, we create the directory that contains * all its data, create the files that hold the global tables, create @@ -42,7 +42,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.117 2006/06/07 22:24:44 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.118 2006/06/18 15:38:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -140,7 +140,7 @@ static char *authwarning = NULL; * (no quoting to worry about). */ static const char *boot_options = "-F"; -static const char *backend_options = "-F -O -c search_path=pg_catalog -c exit_on_error=true"; +static const char *backend_options = "--single -F -O -c search_path=pg_catalog -c exit_on_error=true"; /* path to 'initdb' binary directory */ @@ -1138,7 +1138,7 @@ test_config_settings(void) test_max_fsm = FSM_FOR_BUFS(test_buffs); snprintf(cmd, sizeof(cmd), - "%s\"%s\" -boot -x0 %s " + "%s\"%s\" --boot -x0 %s " "-c max_connections=%d " "-c shared_buffers=%d " "-c max_fsm_pages=%d " @@ -1173,7 +1173,7 @@ test_config_settings(void) test_max_fsm = FSM_FOR_BUFS(test_buffs); snprintf(cmd, sizeof(cmd), - "%s\"%s\" -boot -x0 %s " + "%s\"%s\" --boot -x0 %s " "-c max_connections=%d " "-c shared_buffers=%d " "-c max_fsm_pages=%d " @@ -1402,7 +1402,7 @@ bootstrap_template1(char *short_version) unsetenv("PGCLIENTENCODING"); snprintf(cmd, sizeof(cmd), - "\"%s\" -boot -x1 %s %s template1", + "\"%s\" --boot -x1 %s %s template1", backend_exec, boot_options, talkargs); PG_CMD_OPEN; @@ -2963,7 +2963,7 @@ main(int argc, char *argv[]) get_parent_directory(bin_dir); printf(_("\nSuccess. You can now start the database server using:\n\n" - " %s%s%spostmaster%s -D %s%s%s\n" + " %s%s%spostgres%s -D %s%s%s\n" "or\n" " %s%s%spg_ctl%s -D %s%s%s -l logfile start\n\n"), QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH, diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index c000a46f06..046bf6ac93 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.68 2006/06/07 22:24:44 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.69 2006/06/18 15:38:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -46,8 +46,8 @@ typedef long pgpid_t; #define WHITESPACE "\f\n\r\t\v" /* as defined by isspace() */ -/* postmaster version ident string */ -#define PM_VERSIONSTR "postmaster (PostgreSQL) " PG_VERSION "\n" +/* postgres version ident string */ +#define PM_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n" typedef enum @@ -487,8 +487,8 @@ do_start(void) { old_pid = get_pgpid(); if (old_pid != 0) - write_stderr(_("%s: another postmaster may be running; " - "trying to start postmaster anyway\n"), + write_stderr(_("%s: another server may be running; " + "trying to start server anyway\n"), progname); } @@ -553,7 +553,7 @@ do_start(void) postmaster_path = pg_malloc(MAXPGPATH); - if ((ret = find_other_exec(argv0, "postmaster", PM_VERSIONSTR, + if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, postmaster_path)) < 0) { char full_path[MAXPGPATH]; @@ -562,13 +562,13 @@ do_start(void) StrNCpy(full_path, progname, MAXPGPATH); if (ret == -1) - write_stderr(_("The program \"postmaster\" is needed by %s " + write_stderr(_("The program \"postgres\" is needed by %s " "but was not found in the\n" "same directory as \"%s\".\n" "Check your installation.\n"), progname, full_path); else - write_stderr(_("The program \"postmaster\" was found by \"%s\"\n" + write_stderr(_("The program \"postgres\" was found by \"%s\"\n" "but was not the same version as %s.\n" "Check your installation.\n"), full_path, progname); @@ -580,7 +580,7 @@ do_start(void) exitcode = start_postmaster(); if (exitcode != 0) { - write_stderr(_("%s: could not start postmaster: exit code was %d\n"), + write_stderr(_("%s: could not start server: exit code was %d\n"), progname, exitcode); exit(1); } @@ -591,7 +591,7 @@ do_start(void) pid = get_pgpid(); if (pid == old_pid) { - write_stderr(_("%s: could not start postmaster\n" + write_stderr(_("%s: could not start server\n" "Examine the log output.\n"), progname); exit(1); @@ -600,21 +600,21 @@ do_start(void) if (do_wait) { - print_msg(_("waiting for postmaster to start...")); + print_msg(_("waiting for server to start...")); if (test_postmaster_connection() == false) { - printf(_("could not start postmaster\n")); + printf(_("could not start server\n")); exit(1); } else { print_msg(_(" done\n")); - print_msg(_("postmaster started\n")); + print_msg(_("server started\n")); } } else - print_msg(_("postmaster starting\n")); + print_msg(_("server starting\n")); } @@ -629,14 +629,14 @@ do_stop(void) if (pid == 0) /* no pid file */ { write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file); - write_stderr(_("Is postmaster running?\n")); + write_stderr(_("Is server running?\n")); exit(1); } else if (pid < 0) /* standalone backend, not postmaster */ { pid = -pid; - write_stderr(_("%s: cannot stop postmaster; " - "postgres is running (PID: %ld)\n"), + write_stderr(_("%s: cannot stop server; " + "single-user server is running (PID: %ld)\n"), progname, pid); exit(1); } @@ -650,12 +650,12 @@ do_stop(void) if (!do_wait) { - print_msg(_("postmaster shutting down\n")); + print_msg(_("server shutting down\n")); return; } else { - print_msg(_("waiting for postmaster to shut down...")); + print_msg(_("waiting for server to shut down...")); for (cnt = 0; cnt < wait_seconds; cnt++) { @@ -672,12 +672,12 @@ do_stop(void) { print_msg(_(" failed\n")); - write_stderr(_("%s: postmaster does not shut down\n"), progname); + write_stderr(_("%s: server does not shut down\n"), progname); exit(1); } print_msg(_(" done\n")); - printf(_("postmaster stopped\n")); + printf(_("server stopped\n")); } } @@ -698,8 +698,8 @@ do_restart(void) { write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file); - write_stderr(_("Is postmaster running?\n")); - write_stderr(_("starting postmaster anyway\n")); + write_stderr(_("Is server running?\n")); + write_stderr(_("starting server anyway\n")); do_start(); return; } @@ -708,10 +708,10 @@ do_restart(void) pid = -pid; if (postmaster_is_alive((pid_t) pid)) { - write_stderr(_("%s: cannot restart postmaster; " - "postgres is running (PID: %ld)\n"), + write_stderr(_("%s: cannot restart server; " + "single-user server is running (PID: %ld)\n"), progname, pid); - write_stderr(_("Please terminate postgres and try again.\n")); + write_stderr(_("Please terminate the single-user server and try again.\n")); exit(1); } } @@ -725,7 +725,7 @@ do_restart(void) exit(1); } - print_msg(_("waiting for postmaster to shut down...")); + print_msg(_("waiting for server to shut down...")); /* always wait for restart */ @@ -744,18 +744,18 @@ do_restart(void) { print_msg(_(" failed\n")); - write_stderr(_("%s: postmaster does not shut down\n"), progname); + write_stderr(_("%s: server does not shut down\n"), progname); exit(1); } print_msg(_(" done\n")); - printf(_("postmaster stopped\n")); + printf(_("server stopped\n")); } else { - write_stderr(_("%s: old postmaster process (PID: %ld) seems to be gone\n"), + write_stderr(_("%s: old server process (PID: %ld) seems to be gone\n"), progname, pid); - write_stderr(_("starting postmaster anyway\n")); + write_stderr(_("starting server anyway\n")); } do_start(); @@ -771,16 +771,16 @@ do_reload(void) if (pid == 0) /* no pid file */ { write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file); - write_stderr(_("Is postmaster running?\n")); + write_stderr(_("Is server running?\n")); exit(1); } else if (pid < 0) /* standalone backend, not postmaster */ { pid = -pid; - write_stderr(_("%s: cannot reload postmaster; " - "postgres is running (PID: %ld)\n"), + write_stderr(_("%s: cannot reload server; " + "single-user server is running (PID: %ld)\n"), progname, pid); - write_stderr(_("Please terminate postgres and try again.\n")); + write_stderr(_("Please terminate the single-user server and try again.\n")); exit(1); } @@ -791,7 +791,7 @@ do_reload(void) exit(1); } - print_msg(_("postmaster signaled\n")); + print_msg(_("server signaled\n")); } /* @@ -835,7 +835,7 @@ do_status(void) pid = -pid; if (postmaster_is_alive((pid_t) pid)) { - printf(_("%s: a standalone backend \"postgres\" is running (PID: %ld)\n"), + printf(_("%s: single-user server is running (PID: %ld)\n"), progname, pid); return; } @@ -847,7 +847,7 @@ do_status(void) { char **optlines; - printf(_("%s: postmaster is running (PID: %ld)\n"), + printf(_("%s: server is running (PID: %ld)\n"), progname, pid); optlines = readfile(postopts_file); @@ -858,7 +858,7 @@ do_status(void) } } } - printf(_("%s: neither postmaster nor postgres running\n"), progname); + printf(_("%s: no server running\n"), progname); exit(1); } @@ -909,10 +909,10 @@ pgwin32_CommandLine(bool registration) } else { - ret = find_other_exec(argv0, "postmaster", PM_VERSIONSTR, cmdLine); + ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, cmdLine); if (ret != 0) { - write_stderr(_("%s: could not find postmaster program executable\n"), progname); + write_stderr(_("%s: could not find postgres program executable\n"), progname); exit(1); } } @@ -1373,9 +1373,9 @@ do_help(void) printf(_("\nOptions for start or restart:\n")); printf(_(" -l, --log FILENAME write (or append) server log to FILENAME\n")); - printf(_(" -o OPTIONS command line options to pass to the postmaster\n" + printf(_(" -o OPTIONS command line options to pass to postgres\n" " (PostgreSQL server executable)\n")); - printf(_(" -p PATH-TO-POSTMASTER normally not necessary\n")); + printf(_(" -p PATH-TO-POSTGRES normally not necessary\n")); printf(_("\nOptions for stop or restart:\n")); printf(_(" -m SHUTDOWN-MODE may be \"smart\", \"fast\", or \"immediate\"\n"));