postgres.git / summary / log / commit / refs

commit    104164361cb18d7c36d068e1ddd2453b0e4dc1bb
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Fri Apr 02 15:07:00 2021 +0000
First released in: 14.0, 12.7, 13.3

    pg_checksums: Fix progress reporting.
    
    pg_checksums uses two counters, total size and current size,
    to calculate the progress. Previously the progress that
    pg_checksums reported could not reach 100% at the end.
    The cause of this issue was that the sizes of only pages excluding
    new ones in each file were counted as the current size
    while the size of each file is counted as the total size.
    That is, the total size of all new pages could be reported
    as the difference between the total size and current size.
    
    This commit fixes this issue by making pg_checksums count
    the sizes of all pages including new ones in each file as
    the current size.
    
    Back-patch to v12 where progress reporting was added to pg_checksums.
    
    Reported-by: Shinya Kato
    Author: Shinya Kato
    Reviewed-by: Fujii Masao
    Discussion: https://postgr.es/m/TYAPR01MB289656B1ACA0A5E7CAD07BE3C47A9@TYAPR01MB2896.jpnprd01.prod.outlook.com


 src/bin/pg_checksums/pg_checksums.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index 28aba92a4c3..52e873159d1 100644
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -229,12 +229,19 @@ scan_file(const char *fn, BlockNumber segmentno)
 		}
 		blocks++;
 
+		/*
+		 * Since the file size is counted as total_size for progress status
+		 * information, the sizes of all pages including new ones in the file
+		 * should be counted as current_size. Otherwise the progress reporting
+		 * calculated using those counters may not reach 100%.
+		 */
+		current_size += r;
+
 		/* New pages have no checksum yet */
 		if (PageIsNew(header))
 			continue;
 
 		csum = pg_checksum_page(buf.data, blockno + segmentno * RELSEG_SIZE);
-		current_size += r;
 		if (mode == PG_MODE_CHECK)
 		{
 			if (csum != header->pd_checksum)


[parent: f8c2d491234f]