Commit8e1a8fe

committed

Fix Windows-specific race condition in syslogger. This could've been

the cause of the "could not write to log file: Bad file descriptor"errors reported athttp://archives.postgresql.org//pgsql-general/2008-06/msg00193.phpBackpatch to 8.3, the race condition was introduced by the CSV loggingpatch.Analysis and patch by Gurjeet Singh.

1 parent029348c commit8e1a8feCopy full SHA for 8e1a8fe

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`*`
`20`	`20`	`* IDENTIFICATION`
`21`		`- * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.49 2009/02/24 12:09:09 petere Exp $`
	`21`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.50 2009/03/18 08:44:49 heikki Exp $`
`22`	`22`	`*`
`23`	`23`	`*-------------------------------------------------------------------------`
`24`	`24`	`*/`
`@@ -907,13 +907,14 @@ write_syslogger_file(const char *buffer, int count, int destination)`
`907`	`907`	`if (destination==LOG_DESTINATION_CSVLOG&&csvlogFile==NULL)`
`908`	`908`	`open_csvlogfile();`
`909`	`909`
`910`		`-logfile=destination==LOG_DESTINATION_CSVLOG ?csvlogFile :syslogFile;`
`911`		`-`
`912`		`-#ifndefWIN32`
`913`		`-rc=fwrite(buffer,1,count,logfile);`
`914`		`-#else`
	`910`	`+#ifdefWIN32`
`915`	`911`	`EnterCriticalSection(&sysfileSection);`
	`912`	`+#endif`
	`913`	`+`
	`914`	`+logfile=destination==LOG_DESTINATION_CSVLOG ?csvlogFile :syslogFile;`
`916`	`915`	`rc=fwrite(buffer,1,count,logfile);`
	`916`	`+`
	`917`	`+#ifdefWIN32`
`917`	`918`	`LeaveCriticalSection(&sysfileSection);`
`918`	`919`	`#endif`
`919`	`920`

Comments

(0)