Commit7b0199a

hlinnaka

authored and

pull[bot]

committed

Initialize ListenSocket array earlier.

After commitb0bea38, syslogger prints 63 warnings about failing toclose a listen socket at postmaster startup. That's because thesyslogger process forks before the ListenSockets array is initialized,so ClosePostmasterPorts() calls "close(0)" 64 times. The first callsucceeds, because fd 0 is stdin.This has been like this since commit9a86f03 in version 13, whichmoved the SysLogger_Start() call to before initializing ListenSockets.We just didn't notice until commitb0bea38 added the LOG message.Reported by Michael Paquier and Jeff Janes.Author: Michael PaquierDiscussion:https://www.postgresql.org/message-id/ZOvvuQe0rdj2slA9%40paquier.xyzDiscussion:https://www.postgresql.org/message-id/ZO0fgDwVw2SUJiZx@paquier.xyz#482670177eb4eaf4c9f03c1eed963e5fBackpatch-through: 13

1 parent276115f commit7b0199aCopy full SHA for 7b0199a

File tree

1 file changed

+11

-8

lines changed

src/backend/postmaster
- postmaster.c

1 file changed

+11

-8

lines changed

`‎src/backend/postmaster/postmaster.c‎`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1141,6 +1141,17 @@ PostmasterMain(int argc, char *argv[])`
`1141`	`1141`	`errmsg("could not remove file \"%s\": %m",`
`1142`	`1142`	`LOG_METAINFO_DATAFILE)));`
`1143`	`1143`
	`1144`	`+/*`
	`1145`	`+ * Initialize input sockets.`
	`1146`	`+ *`
	`1147`	`+ * Mark them all closed, and set up an on_proc_exit function that's`
	`1148`	`+ * charged with closing the sockets again at postmaster shutdown.`
	`1149`	`+ */`
	`1150`	`+for (i=0;i<MAXLISTEN;i++)`
	`1151`	`+ListenSocket[i]=PGINVALID_SOCKET;`
	`1152`	`+`
	`1153`	`+on_proc_exit(CloseServerPorts,0);`
	`1154`	`+`
`1144`	`1155`	`/*`
`1145`	`1156`	`* If enabled, start up syslogger collection subprocess`
`1146`	`1157`	`*/`
`@@ -1175,15 +1186,7 @@ PostmasterMain(int argc, char *argv[])`
`1175`	`1186`
`1176`	`1187`	`/*`
`1177`	`1188`	`* Establish input sockets.`
`1178`		`- *`
`1179`		`- * First, mark them all closed, and set up an on_proc_exit function that's`
`1180`		`- * charged with closing the sockets again at postmaster shutdown.`
`1181`	`1189`	`*/`
`1182`		`-for (i=0;i<MAXLISTEN;i++)`
`1183`		`-ListenSocket[i]=PGINVALID_SOCKET;`
`1184`		`-`
`1185`		`-on_proc_exit(CloseServerPorts,0);`
`1186`		`-`
`1187`	`1190`	`if (ListenAddresses)`
`1188`	`1191`	`{`
`1189`	`1192`	`char*rawstring;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7b0199a

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/postmaster.c‎`

0 commit comments