diff options
| -rw-r--r-- | contrib/pg_upgrade/controldata.c | 16 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 8 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 1 |
3 files changed, 17 insertions, 8 deletions
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c index 275aeb37907..b0da994c141 100644 --- a/contrib/pg_upgrade/controldata.c +++ b/contrib/pg_upgrade/controldata.c @@ -234,16 +234,20 @@ get_control_data(ClusterInfo *cluster, bool live_check) } else if ((p = strstr(bufin, "Latest checkpoint's NextXID:")) != NULL) { - char *op = strchr(p, '/'); + p = strchr(p, ':'); + + if (p == NULL || strlen(p) <= 1) + pg_log(PG_FATAL, "%d: controldata retrieval problem\n", __LINE__); - if (op == NULL) - op = strchr(p, ':'); + p++; /* removing ':' char */ + cluster->controldata.chkpnt_nxtepoch = str2uint(p); - if (op == NULL || strlen(op) <= 1) + p = strchr(p, '/'); + if (p == NULL || strlen(p) <= 1) pg_log(PG_FATAL, "%d: controldata retrieval problem\n", __LINE__); - op++; /* removing ':' char */ - cluster->controldata.chkpnt_nxtxid = str2uint(op); + p++; /* removing '/' char */ + cluster->controldata.chkpnt_nxtxid = str2uint(p); got_xid = true; } else if ((p = strstr(bufin, "Latest checkpoint's NextOID:")) != NULL) diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 1fc9d903e1c..d7d88644953 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -423,12 +423,16 @@ copy_clog_xlog_xid(void) /* copy old commit logs to new data dir */ copy_subdir_files("pg_clog"); - /* set the next transaction id of the new cluster */ - prep_status("Setting next transaction ID for new cluster"); + /* set the next transaction id and epoch of the new cluster */ + prep_status("Setting next transaction ID and epoch for new cluster"); exec_prog(UTILITY_LOG_FILE, NULL, true, "\"%s/pg_resetxlog\" -f -x %u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtxid, new_cluster.pgdata); + exec_prog(UTILITY_LOG_FILE, NULL, true, + "\"%s/pg_resetxlog\" -f -e %u \"%s\"", + new_cluster.bindir, old_cluster.controldata.chkpnt_nxtepoch, + new_cluster.pgdata); check_ok(); /* diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 38d37a6c63f..f50388fedbd 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -188,6 +188,7 @@ typedef struct char nextxlogfile[25]; uint32 chkpnt_tli; uint32 chkpnt_nxtxid; + uint32 chkpnt_nxtepoch; uint32 chkpnt_nxtoid; uint32 chkpnt_nxtmulti; uint32 chkpnt_nxtmxoff; |