Commita74a4aa

committed

pg_upgrade: preserve the timestamp epoch

This is useful for replication tools like Slony and Skytools.Report by Sergey Konoplev

1 parent1f4d107 commita74a4aaCopy full SHA for a74a4aa

File tree

+19

-9

lines changed

+19

-9

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,16 +209,20 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`209`	`209`	`}`
`210`	`210`	`elseif ((p=strstr(bufin,"Latest checkpoint's NextXID:"))!=NULL)`
`211`	`211`	`{`
`212`		`-char*op=strchr(p,'/');`
	`212`	`+p=strchr(p,':');`
	`213`	`+`
	`214`	`+if (p==NULL\|\|strlen(p) <=1)`
	`215`	`+pg_fatal("%d: controldata retrieval problem\n",__LINE__);`
`213`	`216`
`214`		`-if (op==NULL)`
`215`		`-op=strchr(p,':');`
	`217`	`+p++;/* removing ':' char */`
	`218`	`+cluster->controldata.chkpnt_nxtepoch=str2uint(p);`
`216`	`219`
`217`		`-if (op==NULL\|\|strlen(op) <=1)`
	`220`	`+p=strchr(p,'/');`
	`221`	`+if (p==NULL\|\|strlen(p) <=1)`
`218`	`222`	`pg_fatal("%d: controldata retrieval problem\n",__LINE__);`
`219`	`223`
`220`		`-op++;/* removing ':' char */`
`221`		`-cluster->controldata.chkpnt_nxtxid=str2uint(op);`
	`224`	`+p++;/* removing '/' char */`
	`225`	`+cluster->controldata.chkpnt_nxtxid=str2uint(p);`
`222`	`226`	`got_xid= true;`
`223`	`227`	`}`
`224`	`228`	`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
`@@ -420,12 +420,16 @@ copy_clog_xlog_xid(void)`
`420`	`420`	`/* copy old commit logs to new data dir */`
`421`	`421`	`copy_subdir_files("pg_clog");`
`422`	`422`
`423`		`-/* set the next transaction id of the new cluster */`
`424`		`-prep_status("Setting next transaction ID for new cluster");`
	`423`	`+/* set the next transaction idand epochof the new cluster */`
	`424`	`+prep_status("Setting next transaction IDand epochfor new cluster");`
`425`	`425`	`exec_prog(UTILITY_LOG_FILE,NULL, true,`
`426`	`426`	`"\"%s/pg_resetxlog\" -f -x %u \"%s\"",`
`427`	`427`	`new_cluster.bindir,old_cluster.controldata.chkpnt_nxtxid,`
`428`	`428`	`new_cluster.pgdata);`
	`429`	`+exec_prog(UTILITY_LOG_FILE,NULL, true,`
	`430`	`+"\"%s/pg_resetxlog\" -f -e %u \"%s\"",`
	`431`	`+new_cluster.bindir,old_cluster.controldata.chkpnt_nxtepoch,`
	`432`	`+new_cluster.pgdata);`
`429`	`433`	`check_ok();`
`430`	`434`
`431`	`435`	`/*`

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ PostgreSQL documentation`
`166`	`166`	`except in the field that is set by <command>pg_resetxlog</command>,`
`167`	`167`	`so any value will work so far as the database itself is concerned.`
`168`	`168`	`You might need to adjust this value to ensure that replication`
`169`		`- systems such as <application>Slony-I</> work correctly —`
	`169`	`+ systems such as <application>Slony-I</> and`
	`170`	`+ <application>Skytools</> work correctly —`
`170`	`171`	`if so, an appropriate value should be obtainable from the state of`
`171`	`172`	`the downstream replicated database.`
`172`	`173`	`</para>`

Comments

(0)