Commit5724f49

committed

pg_upgrade: preserve the timestamp epoch

This is useful for replication tools like Slony and Skytools. This is abackpatch ofa74a4aa.Report by Sergey KonoplevBackpatch through 9.3

1 parentbca9123 commit5724f49Copy full SHA for 5724f49

File tree

+17

-8

lines changed

+17

-8

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -234,16 +234,20 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`234`	`234`	`}`
`235`	`235`	`elseif ((p=strstr(bufin,"Latest checkpoint's NextXID:"))!=NULL)`
`236`	`236`	`{`
`237`		`-char*op=strchr(p,'/');`
	`237`	`+p=strchr(p,':');`
	`238`	`+`
	`239`	`+if (p==NULL\|\|strlen(p) <=1)`
	`240`	`+pg_log(PG_FATAL,"%d: controldata retrieval problem\n",__LINE__);`
`238`	`241`
`239`		`-if (op==NULL)`
`240`		`-op=strchr(p,':');`
	`242`	`+p++;/* removing ':' char */`
	`243`	`+cluster->controldata.chkpnt_nxtepoch=str2uint(p);`
`241`	`244`
`242`		`-if (op==NULL\|\|strlen(op) <=1)`
	`245`	`+p=strchr(p,'/');`
	`246`	`+if (p==NULL\|\|strlen(p) <=1)`
`243`	`247`	`pg_log(PG_FATAL,"%d: controldata retrieval problem\n",__LINE__);`
`244`	`248`
`245`		`-op++;/* removing ':' char */`
`246`		`-cluster->controldata.chkpnt_nxtxid=str2uint(op);`
	`249`	`+p++;/* removing '/' char */`
	`250`	`+cluster->controldata.chkpnt_nxtxid=str2uint(p);`
`247`	`251`	`got_xid= true;`
`248`	`252`	`}`
`249`	`253`	`elseif ((p=strstr(bufin,"Latest checkpoint's NextOID:"))!=NULL)`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -423,12 +423,16 @@ copy_clog_xlog_xid(void)`
`423`	`423`	`/* copy old commit logs to new data dir */`
`424`	`424`	`copy_subdir_files("pg_clog");`
`425`	`425`
`426`		`-/* set the next transaction id of the new cluster */`
`427`		`-prep_status("Setting next transaction ID for new cluster");`
	`426`	`+/* set the next transaction idand epochof the new cluster */`
	`427`	`+prep_status("Setting next transaction IDand epochfor new cluster");`
`428`	`428`	`exec_prog(UTILITY_LOG_FILE,NULL, true,`
`429`	`429`	`"\"%s/pg_resetxlog\" -f -x %u \"%s\"",`
`430`	`430`	`new_cluster.bindir,old_cluster.controldata.chkpnt_nxtxid,`
`431`	`431`	`new_cluster.pgdata);`
	`432`	`+exec_prog(UTILITY_LOG_FILE,NULL, true,`
	`433`	`+"\"%s/pg_resetxlog\" -f -e %u \"%s\"",`
	`434`	`+new_cluster.bindir,old_cluster.controldata.chkpnt_nxtepoch,`
	`435`	`+new_cluster.pgdata);`
`432`	`436`	`check_ok();`
`433`	`437`
`434`	`438`	`/*`

Lines changed: 1 addition & 0 deletions

Comments

(0)