Make log_temp_files based on kB, and revert docs & comments to match.

robertmhaas · robertmhaas · commit 20be0d480a16 · 2010-07-06T22:55:26.000Z
Per extensive discussion on pgsql-hackers.  We are deliberately not
back-patching this even though the behavior of 8.3 and 8.4 is
unquestionably broken, for fear of breaking existing users of this
parameter.  This incompatibility should be release-noted.
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.292 2010/07/06 21:14:25 rhaas Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.293 2010/07/06 22:55:26 rhaas Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -3607,7 +3607,7 @@ FROM pg_stat_activity;
         A log entry is made for each temporary file when it is deleted.
         A value of zero logs all temporary file information, while positive
         values log only files whose size is greater than or equal to
-        the specified number of bytes.  The
+        the specified number of kilobytes.  The
         default setting is <literal>-1</>, which disables such logging.
         Only superusers can change this setting.
        </para>
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.156 2010/02/26 02:00:59 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.157 2010/07/06 22:55:26 rhaas Exp $
  *
  * NOTES:
  *
@@ -1062,7 +1062,7 @@ FileClose(File file)
 		{
 			if (stat(vfdP->fileName, &filestats) == 0)
 			{
-				if (filestats.st_size >= log_temp_files)
+				if ((filestats.st_size / 1024) >= log_temp_files)
 					ereport(LOG,
 							(errmsg("temporary file: path \"%s\", size %lu",
 									vfdP->fileName,
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.560 2010/07/06 19:18:58 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.561 2010/07/06 22:55:26 rhaas Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -2061,7 +2061,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"log_temp_files", PGC_SUSET, LOGGING_WHAT,
-			gettext_noop("Log the use of temporary files larger than this number of bytes."),
+			gettext_noop("Log the use of temporary files larger than this number of kilobytes."),
 			gettext_noop("Zero logs all files. The default is -1 (turning this feature off)."),
 			GUC_UNIT_KB
 		},

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.156 2010/02/26 02:00:59 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.157 2010/07/06 22:55:26 rhaas Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES:`
`13`	`13`	`*`
`@@ -1062,7 +1062,7 @@ FileClose(File file)`
`1062`	`1062`	`{`
`1063`	`1063`	`if (stat(vfdP->fileName, &filestats) == 0)`
`1064`	`1064`	`{`
`1065`		`- if (filestats.st_size >= log_temp_files)`
	`1065`	`+ if ((filestats.st_size / 1024) >= log_temp_files)`
`1066`	`1066`	`ereport(LOG,`
`1067`	`1067`	`(errmsg("temporary file: path \"%s\", size %lu",`
`1068`	`1068`	`vfdP->fileName,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.560 2010/07/06 19:18:58 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.561 2010/07/06 22:55:26 rhaas Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -2061,7 +2061,7 @@ static struct config_int ConfigureNamesInt[] =`
`2061`	`2061`
`2062`	`2062`	`{`
`2063`	`2063`	`{"log_temp_files", PGC_SUSET, LOGGING_WHAT,`
`2064`		`- gettext_noop("Log the use of temporary files larger than this number of bytes."),`
	`2064`	`+ gettext_noop("Log the use of temporary files larger than this number of kilobytes."),`
`2065`	`2065`	`gettext_noop("Zero logs all files. The default is -1 (turning this feature off)."),`
`2066`	`2066`	`GUC_UNIT_KB`
`2067`	`2067`	`},`