Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit125f551

Browse files
committed
Leave SIGTTIN/SIGTTOU signal handling alone in postmaster child processes.
For reasons lost in the mists of time, most postmaster child processesreset SIGTTIN/SIGTTOU signal handling to SIG_DFL, with the major exceptionthat backend sessions do not. It seems like a pretty bad idea for anypostmaster children to do that: if stderr is connected to the terminal,and the user has put the postmaster in background, any log output wouldresult in the child process freezing up. Hence, switch them all todoing what backends do, ie, nothing. This allows them to inherit thepostmaster's SIG_IGN setting. On the other hand, manually-launchedprocesses such as standalone backends will have default processing,which seems fine.In passing, also remove useless resets of SIGCONT and SIGWINCH signalprocessing. Perhaps the postmaster once changed those to somethingbesides SIG_DFL, but it doesn't now, so these are just wasted (andconfusing) syscalls.Basically, this propagates the changes made in commit8e2998d frombackends to other postmaster children. Probably the only reason thesecalls now exist elsewhere is that I missed changing pgstat.c along withpostgres.c at the time.Given the lack of field complaints that can be traced to this, I don'tpresently feel a need to back-patch.Discussion:https://postgr.es/m/5627.1542477392@sss.pgh.pa.us
1 parent7361612 commit125f551

File tree

10 files changed

+11
-36
lines changed

10 files changed

+11
-36
lines changed

‎src/backend/postmaster/bgwriter.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ BackgroundWriterMain(void)
133133
* Reset some signals that are accepted by postmaster but not here
134134
*/
135135
pqsignal(SIGCHLD,SIG_DFL);
136-
pqsignal(SIGTTIN,SIG_DFL);
137-
pqsignal(SIGTTOU,SIG_DFL);
138-
pqsignal(SIGCONT,SIG_DFL);
139-
pqsignal(SIGWINCH,SIG_DFL);
140136

141137
/* We allow SIGQUIT (quickdie) at all times */
142138
sigdelset(&BlockSig,SIGQUIT);

‎src/backend/postmaster/checkpointer.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,6 @@ CheckpointerMain(void)
218218
* Reset some signals that are accepted by postmaster but not here
219219
*/
220220
pqsignal(SIGCHLD,SIG_DFL);
221-
pqsignal(SIGTTIN,SIG_DFL);
222-
pqsignal(SIGTTOU,SIG_DFL);
223-
pqsignal(SIGCONT,SIG_DFL);
224-
pqsignal(SIGWINCH,SIG_DFL);
225221

226222
/* We allow SIGQUIT (quickdie) at all times */
227223
sigdelset(&BlockSig,SIGQUIT);

‎src/backend/postmaster/pgarch.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,8 @@ PgArchiverMain(int argc, char *argv[])
226226
pqsignal(SIGPIPE,SIG_IGN);
227227
pqsignal(SIGUSR1,pgarch_waken);
228228
pqsignal(SIGUSR2,pgarch_waken_stop);
229+
/* Reset some signals that are accepted by postmaster but not here */
229230
pqsignal(SIGCHLD,SIG_DFL);
230-
pqsignal(SIGTTIN,SIG_DFL);
231-
pqsignal(SIGTTOU,SIG_DFL);
232-
pqsignal(SIGCONT,SIG_DFL);
233-
pqsignal(SIGWINCH,SIG_DFL);
234231
PG_SETMASK(&UnBlockSig);
235232

236233
/*

‎src/backend/postmaster/pgstat.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4267,11 +4267,8 @@ PgstatCollectorMain(int argc, char *argv[])
42674267
pqsignal(SIGPIPE,SIG_IGN);
42684268
pqsignal(SIGUSR1,SIG_IGN);
42694269
pqsignal(SIGUSR2,SIG_IGN);
4270+
/* Reset some signals that are accepted by postmaster but not here */
42704271
pqsignal(SIGCHLD,SIG_DFL);
4271-
pqsignal(SIGTTIN,SIG_DFL);
4272-
pqsignal(SIGTTOU,SIG_DFL);
4273-
pqsignal(SIGCONT,SIG_DFL);
4274-
pqsignal(SIGWINCH,SIG_DFL);
42754272
PG_SETMASK(&UnBlockSig);
42764273

42774274
/*

‎src/backend/postmaster/postmaster.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,17 @@ PostmasterMain(int argc, char *argv[])
646646
pqsignal_no_restart(SIGUSR2,dummy_handler);/* unused, reserve for
647647
* children */
648648
pqsignal_no_restart(SIGCHLD,reaper);/* handle child termination */
649+
650+
/*
651+
* No other place in Postgres should touch SIGTTIN/SIGTTOU handling. We
652+
* ignore those signals in a postmaster environment, so that there is no
653+
* risk of a child process freezing up due to writing to stderr. But for
654+
* a standalone backend, their default handling is reasonable. Hence, all
655+
* child processes should just allow the inherited settings to stand.
656+
*/
649657
pqsignal(SIGTTIN,SIG_IGN);/* ignored */
650658
pqsignal(SIGTTOU,SIG_IGN);/* ignored */
659+
651660
/* ignore SIGXFSZ, so that ulimit violations work like disk full */
652661
#ifdefSIGXFSZ
653662
pqsignal(SIGXFSZ,SIG_IGN);/* ignored */

‎src/backend/postmaster/startup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,6 @@ StartupProcessMain(void)
188188
* Reset some signals that are accepted by postmaster but not here
189189
*/
190190
pqsignal(SIGCHLD,SIG_DFL);
191-
pqsignal(SIGTTIN,SIG_DFL);
192-
pqsignal(SIGTTOU,SIG_DFL);
193-
pqsignal(SIGCONT,SIG_DFL);
194-
pqsignal(SIGWINCH,SIG_DFL);
195191

196192
/*
197193
* Register timeouts needed for standby mode

‎src/backend/postmaster/syslogger.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,6 @@ SysLoggerMain(int argc, char *argv[])
257257
* Reset some signals that are accepted by postmaster but not here
258258
*/
259259
pqsignal(SIGCHLD,SIG_DFL);
260-
pqsignal(SIGTTIN,SIG_DFL);
261-
pqsignal(SIGTTOU,SIG_DFL);
262-
pqsignal(SIGCONT,SIG_DFL);
263-
pqsignal(SIGWINCH,SIG_DFL);
264260

265261
PG_SETMASK(&UnBlockSig);
266262

‎src/backend/postmaster/walwriter.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ WalWriterMain(void)
121121
* Reset some signals that are accepted by postmaster but not here
122122
*/
123123
pqsignal(SIGCHLD,SIG_DFL);
124-
pqsignal(SIGTTIN,SIG_DFL);
125-
pqsignal(SIGTTOU,SIG_DFL);
126-
pqsignal(SIGCONT,SIG_DFL);
127-
pqsignal(SIGWINCH,SIG_DFL);
128124

129125
/* We allow SIGQUIT (quickdie) at all times */
130126
sigdelset(&BlockSig,SIGQUIT);

‎src/backend/replication/walreceiver.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,6 @@ WalReceiverMain(void)
279279

280280
/* Reset some signals that are accepted by postmaster but not here */
281281
pqsignal(SIGCHLD,SIG_DFL);
282-
pqsignal(SIGTTIN,SIG_DFL);
283-
pqsignal(SIGTTOU,SIG_DFL);
284-
pqsignal(SIGCONT,SIG_DFL);
285-
pqsignal(SIGWINCH,SIG_DFL);
286282

287283
/* We allow SIGQUIT (quickdie) at all times */
288284
sigdelset(&BlockSig,SIGQUIT);

‎src/backend/replication/walsender.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3003,10 +3003,6 @@ WalSndSignals(void)
30033003

30043004
/* Reset some signals that are accepted by postmaster but not here */
30053005
pqsignal(SIGCHLD,SIG_DFL);
3006-
pqsignal(SIGTTIN,SIG_DFL);
3007-
pqsignal(SIGTTOU,SIG_DFL);
3008-
pqsignal(SIGCONT,SIG_DFL);
3009-
pqsignal(SIGWINCH,SIG_DFL);
30103006
}
30113007

30123008
/* Report shared-memory space needed by WalSndShmemInit */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp