database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Fix syslogger to not fail when log_rotation_age exceeds 2^31 milliseconds.

Browse Source 
We need to avoid calling WaitLatch with timeouts exceeding INT_MAX.
Fortunately a simple clamp will do the trick, since no harm is done if
the wait times out before it's really time to rotate the log file.
Per bug #7670 (probably bug #7545 is the same thing, too).

In passing, fix bogus definition of log_rotation_age's maximum value in
guc.c --- it was numerically right, but only because MINS_PER_HOUR and
SECS_PER_MINUTE have the same value.

Back-patch to 9.2.  Before that, syslogger wasn't using WaitLatch.
This commit is contained in:
Tom Lane 2012-11-18 16:16:47 -05:00
parent f0461cd861
commit 89067bc16a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/postmaster/syslogger.c
View File

@ -24,6 +24,7 @@
#include "postgres.h" #include "postgres.h"
#include <fcntl.h> #include <fcntl.h>
#include <limits.h>
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
@ -415,11 +416,23 @@ SysLoggerMain(int argc, char *argv[])
* above is still close enough. Note we can't make this calculation * above is still close enough. Note we can't make this calculation
* until after calling logfile_rotate(), since it will advance * until after calling logfile_rotate(), since it will advance
* next_rotation_time. * next_rotation_time.
*
* Also note that we need to beware of overflow in calculation of the
* timeout: with large settings of Log_RotationAge, next_rotation_time
* could be more than INT_MAX msec in the future. In that case we'll
* wait no more than INT_MAX msec, and try again.
*/ */
if (Log_RotationAge > 0 && !rotation_disabled) if (Log_RotationAge > 0 && !rotation_disabled)
{ {
if (now < next_rotation_time) pg_time_t delay;
cur_timeout = (next_rotation_time - now) * 1000L; /* msec */
delay = next_rotation_time - now;
if (delay > 0)
{
if (delay > INT_MAX / 1000)
delay = INT_MAX / 1000;
cur_timeout = delay * 1000L; /* msec */
}
else else
cur_timeout = 0; cur_timeout = 0;
cur_flags = WL_TIMEOUT; cur_flags = WL_TIMEOUT;

2
src/backend/utils/misc/guc.c
View File

@ -2134,7 +2134,7 @@ static struct config_int ConfigureNamesInt[] =
GUC_UNIT_MIN GUC_UNIT_MIN
}, },
&Log_RotationAge, &Log_RotationAge,
HOURS_PER_DAY * MINS_PER_HOUR, 0, INT_MAX / MINS_PER_HOUR, HOURS_PER_DAY * MINS_PER_HOUR, 0, INT_MAX / SECS_PER_MINUTE,
NULL, NULL, NULL NULL, NULL, NULL
}, },