Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b7c5823

Browse files
committed
Work around portability issue with newer versions of mktime().
Recent glibc versions have made mktime() fail if tm_isdst is inconsistent with the prevailing timezone; in particular it fails for tm_isdst = 1 when the zone is UTC. (This seems wildly inconsistent with the POSIX-mandated treatment of "incorrect" values for the other fields of struct tm, so if you ask me it's a bug, but I bet they'll say it's intentional.) This has been observed to cause cosmetic problems when pg_restore'ing an archive created in a different timezone. To fix, do mktime() using the field values from the archive, and if that fails try again with tm_isdst = -1. This will give a result that's off by the UTC-offset difference from the original zone, but that was true before, too. It's not terribly critical since we don't do anything with the result except possibly print it. (Someday we should flush this entire bit of logic and record a standard-format timestamp in the archive instead. That's not okay for a back-patched bug fix, though.) Also, guard our only other use of mktime() by having initdb's build_time_t() set tm_isdst = -1 not 0. This case could only have an issue in zones that are DST year-round; but I think some do exist, or could in future. Per report from Wells Oliver. Back-patch to all supported versions, since any of them might need to run with a newer glibc. Discussion: https://postgr.es/m/CAOC+FBWDhDHO7G-i1_n_hjRzCnUeFO+H-Czi1y10mFhRWpBrew@mail.gmail.com
1 parent 914c716 commit b7c5823

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

src/bin/initdb/findtimezone.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ build_time_t(int year, int month, int day)
195195
tm.tm_mday = day;
196196
tm.tm_mon = month - 1;
197197
tm.tm_year = year - 1900;
198+
tm.tm_isdst = -1;
198199

199200
return mktime(&tm);
200201
}

src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3718,7 +3718,6 @@ ReadHead(ArchiveHandle *AH)
37183718
vmin,
37193719
vrev;
37203720
int fmt;
3721-
struct tm crtm;
37223721

37233722
/*
37243723
* If we haven't already read the header, do so.
@@ -3786,6 +3785,8 @@ ReadHead(ArchiveHandle *AH)
37863785

37873786
if (AH->version >= K_VERS_1_4)
37883787
{
3788+
struct tm crtm;
3789+
37893790
crtm.tm_sec = ReadInt(AH);
37903791
crtm.tm_min = ReadInt(AH);
37913792
crtm.tm_hour = ReadInt(AH);
@@ -3794,12 +3795,32 @@ ReadHead(ArchiveHandle *AH)
37943795
crtm.tm_year = ReadInt(AH);
37953796
crtm.tm_isdst = ReadInt(AH);
37963797

3797-
AH->archdbname = ReadStr(AH);
3798-
3798+
/*
3799+
* Newer versions of glibc have mktime() report failure if tm_isdst is
3800+
* inconsistent with the prevailing timezone, e.g. tm_isdst = 1 when
3801+
* TZ=UTC. This is problematic when restoring an archive under a
3802+
* different timezone setting. If we get a failure, try again with
3803+
* tm_isdst set to -1 ("don't know").
3804+
*
3805+
* XXX with or without this hack, we reconstruct createDate
3806+
* incorrectly when the prevailing timezone is different from
3807+
* pg_dump's. Next time we bump the archive version, we should flush
3808+
* this representation and store a plain seconds-since-the-Epoch
3809+
* timestamp instead.
3810+
*/
37993811
AH->createDate = mktime(&crtm);
3800-
38013812
if (AH->createDate == (time_t) -1)
3802-
pg_log_warning("invalid creation date in header");
3813+
{
3814+
crtm.tm_isdst = -1;
3815+
AH->createDate = mktime(&crtm);
3816+
if (AH->createDate == (time_t) -1)
3817+
pg_log_warning("invalid creation date in header");
3818+
}
3819+
}
3820+
3821+
if (AH->version >= K_VERS_1_4)
3822+
{
3823+
AH->archdbname = ReadStr(AH);
38033824
}
38043825

38053826
if (AH->version >= K_VERS_1_10)

0 commit comments

Comments
 (0)