ptrack_enable fix

gsmolk · gsmolk · commit af99fe4daa3d · 2017-10-05T12:03:42.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -598,9 +598,9 @@ do_backup_instance(void)
 
 		if (ptrack_lsn > prev_backup->stop_lsn)
 		{
-			elog(ERROR, "LSN from ptrack_control %lx differs from LSN of previous backup %lx.\n"
+			elog(ERROR, "LSN from ptrack_control %lx differs from STOP LSN of previous backup %lx.\n"
 						"Create new full backup before an incremental one.",
-						ptrack_lsn, prev_backup->start_lsn);
+						ptrack_lsn, prev_backup->stop_lsn);
 		}
 		parray_qsort(backup_files_list, pgFileComparePath);
 		make_pagemap_from_ptrack(backup_files_list);
@@ -782,14 +782,17 @@ do_backup(void)
 	current.stream = stream_wal;
 
 	is_ptrack_support = pg_ptrack_support();
+	if (is_ptrack_support)
+	{
+		is_ptrack_enable = pg_ptrack_enable();
+	}
 
 	if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
 	{
 		if (!is_ptrack_support)
 			elog(ERROR, "This PostgreSQL instance does not support ptrack");
 		else
 		{
-			is_ptrack_enable = pg_ptrack_enable();
 			if(!is_ptrack_enable)
 				elog(ERROR, "Ptrack is disabled");
 		}

Original file line number	Diff line number	Diff line change
`@@ -598,9 +598,9 @@ do_backup_instance(void)`
`598`	`598`
`599`	`599`	`if (ptrack_lsn > prev_backup->stop_lsn)`
`600`	`600`	`{`
`601`		`- elog(ERROR, "LSN from ptrack_control %lx differs from LSN of previous backup %lx.\n"`
	`601`	`+ elog(ERROR, "LSN from ptrack_control %lx differs from STOP LSN of previous backup %lx.\n"`
`602`	`602`	`"Create new full backup before an incremental one.",`
`603`		`- ptrack_lsn, prev_backup->start_lsn);`
	`603`	`+ ptrack_lsn, prev_backup->stop_lsn);`
`604`	`604`	`}`
`605`	`605`	`parray_qsort(backup_files_list, pgFileComparePath);`
`606`	`606`	`make_pagemap_from_ptrack(backup_files_list);`
`@@ -782,14 +782,17 @@ do_backup(void)`
`782`	`782`	`current.stream = stream_wal;`
`783`	`783`
`784`	`784`	`is_ptrack_support = pg_ptrack_support();`
	`785`	`+ if (is_ptrack_support)`
	`786`	`+ {`
	`787`	`+ is_ptrack_enable = pg_ptrack_enable();`
	`788`	`+ }`
`785`	`789`
`786`	`790`	`if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)`
`787`	`791`	`{`
`788`	`792`	`if (!is_ptrack_support)`
`789`	`793`	`elog(ERROR, "This PostgreSQL instance does not support ptrack");`
`790`	`794`	`else`
`791`	`795`	`{`
`792`		`- is_ptrack_enable = pg_ptrack_enable();`
`793`	`796`	`if(!is_ptrack_enable)`
`794`	`797`	`elog(ERROR, "Ptrack is disabled");`
`795`	`798`	`}`