Commitfc74e7d

committed

Merge branch 'ptrack_to_delta'

2 parentsb7a4439 +8b43cae commitfc74e7dCopy full SHA for fc74e7d

File tree

+313

-79

lines changed

+313

-79

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -202,9 +202,21 @@ get_ptrack_version(PGconn backup_conn, PGNodeInfo nodeInfo)`
`202`	`202`	`elseif (strcmp(ptrack_version_str,"2.1")==0)`
`203`	`203`	`nodeInfo->ptrack_version_num=21;`
`204`	`204`	`else`
`205`		`-elog(WARNING,"Update your ptrack to the version1.5 or upper. Current version is %s",`
	`205`	`+elog(WARNING,"Update your ptrack to the version2.1 or upper. Current version is %s",`
`206`	`206`	`ptrack_version_str);`
`207`	`207`
	`208`	`+/* ptrack 1.X is buggy, so fall back to DELTA backup strategy for safety */`
	`209`	`+if (nodeInfo->ptrack_version_num >=15&&nodeInfo->ptrack_version_num<20)`
	`210`	`+{`
	`211`	`+if (current.backup_mode==BACKUP_MODE_DIFF_PTRACK)`
	`212`	`+{`
	`213`	`+elog(WARNING,"Update your ptrack to the version 2.1 or upper. Current version is %s. "`
	`214`	`+"Fall back to DELTA backup.",`
	`215`	`+ptrack_version_str);`
	`216`	`+current.backup_mode=BACKUP_MODE_DIFF_DELTA;`
	`217`	`+}`
	`218`	`+}`
	`219`	`+`
`208`	`220`	`PQclear(res_db);`
`209`	`221`	`}`
`210`	`222`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ def make_simple_node(`
`365`	`365`	`options['max_wal_senders']=10`
`366`	`366`
`367`	`367`	`ifptrack_enable:`
`368`		`-ifnode.major_version>11:`
	`368`	`+ifnode.major_version>=11:`
`369`	`369`	`options['ptrack.map_size']='128'`
`370`	`370`	`options['shared_preload_libraries']='ptrack'`
`371`	`371`	`else:`

Comments

(0)