[PBCKP-150] review fixes #2

Daniel Shelepanov · Daniel Shelepanov · commit 9b88a5a0c904 · 2022-05-11T12:45:39.000+03:00
diff --git a/src/data.c b/src/data.c
@@ -301,9 +301,6 @@ prepare_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 	{
 		/* read the block */
 		int read_len = fio_pread(in, page, blknum * BLCKSZ);
-		/* avoid re-reading once buffered data, flushing on further attempts, see PBCKP-150 */
-		if(try_again < PAGE_READ_ATTEMPTS - 1)
-			fflush(in);
 
 		/* The block could have been truncated. It is fine. */
 		if (read_len == 0)
@@ -352,6 +349,8 @@ prepare_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 					Assert(false);
 			}
 		}
+		/* avoid re-reading once buffered data, flushing on further attempts, see PBCKP-150 */
+		fflush(in);
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -301,9 +301,6 @@ prepare_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,`
`301`	`301`	`{`
`302`	`302`	`/* read the block */`
`303`	`303`	`int read_len = fio_pread(in, page, blknum * BLCKSZ);`
`304`		`- /* avoid re-reading once buffered data, flushing on further attempts, see PBCKP-150 */`
`305`		`- if(try_again < PAGE_READ_ATTEMPTS - 1)`
`306`		`- fflush(in);`
`307`	`304`
`308`	`305`	`/* The block could have been truncated. It is fine. */`
`309`	`306`	`if (read_len == 0)`
`@@ -352,6 +349,8 @@ prepare_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,`
`352`	`349`	`Assert(false);`
`353`	`350`	`}`
`354`	`351`	`}`
	`352`	`+ /* avoid re-reading once buffered data, flushing on further attempts, see PBCKP-150 */`
	`353`	`+ fflush(in);`
`355`	`354`	`}`
`356`	`355`
`357`	`356`	`/*`