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

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
index 7e0c7647a4a5a88b8518216dcc044c977cea029b..e54b09545d0a362fbb71dec90599c8b12abc57cc 100644 (file)
--- 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
index f68129a8b8751745040442447437bade88e3f529..91bf4af8e4d72bc5dd619cea174e6d94f504cdb9 100644 (file)
--- 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
index dd0e10ca93c29e363487e89547d9562a08e797f2..08704d48cf095e9697a249b85a16995543f2df36 100644 (file)
--- 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
        },