Merge pull request #386 from postgrespro/release_2_5-pgpro-5018

PGPRO-5018: Passing prev_backup_start_lsn (also known as horizonLsn) …

Author: gsmolk

src/data.c

@@ -459,7 +459,7 @@ prepare_page(ConnectionArgs *conn_arg,
 	 * Skip page if page lsn is less than START_LSN of parent backup.
 	 * Nullified pages must be copied by DELTA backup, just to be safe.
 	 */
-	if (backup_mode == BACKUP_MODE_DIFF_DELTA &&
+	if ((backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
 		file->exists_in_prev &&
 		page_st->lsn > 0 &&
 		page_st->lsn < prev_backup_start_lsn)
@@ -603,7 +603,7 @@ backup_data_file(ConnectionArgs* conn_arg, pgFile *file,
 
 		rc = fio_send_pages(to_fullpath, from_fullpath, file,
 							/* send prev backup START_LSN */
-							backup_mode == BACKUP_MODE_DIFF_DELTA &&
+							(backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
 							file->exists_in_prev ? prev_backup_start_lsn : InvalidXLogRecPtr,
 							calg, clevel, checksum_version,
 							/* send pagemap if any */
@@ -616,7 +616,7 @@ backup_data_file(ConnectionArgs* conn_arg, pgFile *file,
 		/* TODO: stop handling errors internally */
 		rc = send_pages(conn_arg, to_fullpath, from_fullpath, file,
 						/* send prev backup START_LSN */
-						backup_mode == BACKUP_MODE_DIFF_DELTA &&
+						(backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
 						file->exists_in_prev ? prev_backup_start_lsn : InvalidXLogRecPtr,
 						calg, clevel, checksum_version, use_pagemap,
 						&headers, backup_mode, ptrack_version_num, ptrack_schema);

src/utils/file.c

@@ -1992,13 +1992,13 @@ static void fio_send_pages_impl(int out, char* buf)
 		n_blocks_read++;
 
 		/*
-		 * horizonLsn is not 0 only in case of delta backup.
+		 * horizonLsn is not 0 only in case of delta and ptrack backup.
 		 * As far as unsigned number are always greater or equal than zero,
 		 * there is no sense to add more checks.
 		 */
-		if ((req->horizonLsn == InvalidXLogRecPtr) ||                 /* full, page, ptrack */
+		if ((req->horizonLsn == InvalidXLogRecPtr) ||                 /* full, page */
 			(page_st.lsn == InvalidXLogRecPtr) ||                     /* zeroed page */
-			(req->horizonLsn > 0 && page_st.lsn > req->horizonLsn))   /* delta */
+			(req->horizonLsn > 0 && page_st.lsn > req->horizonLsn))   /* delta, ptrack */
 		{
 			int  compressed_size = 0;
 			char write_buffer[BLCKSZ*2];