Fix Y2038 issues with MyStartTime.

Several places treat MyStartTime as a "long", which is only 32 bits
wide on some platforms.  In reality, MyStartTime is a pg_time_t,
i.e., a signed 64-bit integer.  This will lead to interesting bugs
on the aforementioned systems in 2038 when signed 32-bit integers
are no longer sufficient to store Unix time (e.g., "pg_ctl start"
hanging).  To fix, ensure that MyStartTime is handled as a 64-bit
value everywhere.  (Of course, users will need to ensure that
time_t is 64 bits wide on their system, too.)

Co-authored-by: Max Johnson
Discussion: https://postgr.es/m/CO1PR07MB905262E8AC270FAAACED66008D682%40CO1PR07MB9052.namprd07.prod.outlook.com
Backpatch-through: 12

diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 2e0e8ee8b57ebc359da0d6b08ed6b1197fed08fd..fa2044b2c5d532efc25e6de9081d6d798bb453f9 100644 (file)
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -490,7 +490,7 @@ process_pgfdw_appname(const char *appname)
                appendStringInfoString(&buf, application_name);
                break;
            case 'c':
-               appendStringInfo(&buf, "%lx.%x", (long) (MyStartTime), MyProcPid);
+               appendStringInfo(&buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
                break;
            case 'C':
                appendStringInfoString(&buf, cluster_name);

diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.c
index 5c49bc4209e9c9c00e1ab5c049225b49296d0474..37774156a69ed23e4283aecd222c5bb6484f9d09 100644 (file)
--- a/src/backend/utils/error/csvlog.c
+++ b/src/backend/utils/error/csvlog.c
@@ -122,7 +122,7 @@ write_csvlog(ErrorData *edata)
    appendStringInfoChar(&buf, ',');
 
    /* session id */
-   appendStringInfo(&buf, "%lx.%x", (long) MyStartTime, MyProcPid);
+   appendStringInfo(&buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
    appendStringInfoChar(&buf, ',');
 
    /* Line number */

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index f34858b4e86bf87a2a6fb264eedba4c7e0b7258e..6198fd87120e31d3de686bc52a0b487f98ddd294 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2596,12 +2596,12 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
                {
                    char        strfbuf[128];
 
-                   snprintf(strfbuf, sizeof(strfbuf) - 1, "%lx.%x",
-                            (long) (MyStartTime), MyProcPid);
+                   snprintf(strfbuf, sizeof(strfbuf) - 1, "%" INT64_MODIFIER "x.%x",
+                            MyStartTime, MyProcPid);
                    appendStringInfo(buf, "%*s", padding, strfbuf);
                }
                else
-                   appendStringInfo(buf, "%lx.%x", (long) (MyStartTime), MyProcPid);
+                   appendStringInfo(buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
                break;
            case 'p':
                if (padding != 0)

diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c
index 27ad7686d811784e797b2b0b99b30adbfdce448b..fd7e564ed8763978093b4a260cfc23121624f1e2 100644 (file)
--- a/src/backend/utils/error/jsonlog.c
+++ b/src/backend/utils/error/jsonlog.c
@@ -170,8 +170,8 @@ write_jsonlog(ErrorData *edata)
    }
 
    /* Session id */
-   appendJSONKeyValueFmt(&buf, "session_id", true, "%lx.%x",
-                         (long) MyStartTime, MyProcPid);
+   appendJSONKeyValueFmt(&buf, "session_id", true, "%" INT64_MODIFIER "x.%x",
+                         MyStartTime, MyProcPid);
 
    /* Line number */
    appendJSONKeyValueFmt(&buf, "line_num", false, "%ld", log_line_number);

diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 79373f2c8f077fea33e8be76505b9c46521adaf3..8997193ca1c7128c4688c2dfad9f99b91381f0e1 100644 (file)
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -1220,10 +1220,10 @@ CreateLockFile(const char *filename, bool amPostmaster,
     * both datadir and socket lockfiles; although more stuff may get added to
     * the datadir lockfile later.
     */
-   snprintf(buffer, sizeof(buffer), "%d\n%s\n%ld\n%d\n%s\n",
+   snprintf(buffer, sizeof(buffer), "%d\n%s\n" INT64_FORMAT "\n%d\n%s\n",
             amPostmaster ? (int) my_pid : -((int) my_pid),
             DataDir,
-            (long) MyStartTime,
+            MyStartTime,
             PostPortNumber,
             socketDir);
 

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index f58320b8060b6f1b36a38b528454fe368b57cdab..2818af51958ef7d9f104f2bfb2ecdc52b9164d0a 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -624,7 +624,7 @@ wait_for_postmaster_start(pgpid_t pm_pid, bool do_checkpoint)
             * Allow 2 seconds slop for possible cross-process clock skew.
             */
            pmpid = atol(optlines[LOCK_FILE_LINE_PID - 1]);
-           pmstart = atol(optlines[LOCK_FILE_LINE_START_TIME - 1]);
+           pmstart = atoll(optlines[LOCK_FILE_LINE_START_TIME - 1]);
            if (pmstart >= start_time - 2 &&
 #ifndef WIN32
                pmpid == pm_pid