Count locked pages that don't need vacuuming as scanned.

hlinnaka · hlinnaka · commit 4c697d8f4845 · 2013-11-18T09:51:09.000+02:00
Previously, if VACUUM skipped vacuuming a page because it's pinned, it
didn't count that page as scanned. However, that meant that relfrozenxid
was not bumped up either, which prevented anti-wraparound vacuum from
doing its job.

Report by Миша Тюрин, analysis and patch by Sergey Burladyn and Jeff Janes.
Backpatch to 9.2, where the skip-locked-pages behavior was introduced.
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
@@ -602,6 +602,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 			if (!lazy_check_needs_freeze(buf))
 			{
 				UnlockReleaseBuffer(buf);
+				vacrelstats->scanned_pages++;
 				continue;
 			}
 			LockBuffer(buf, BUFFER_LOCK_UNLOCK);

Original file line number	Diff line number	Diff line change
`@@ -602,6 +602,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,`
`602`	`602`	`if (!lazy_check_needs_freeze(buf))`
`603`	`603`	`{`
`604`	`604`	`UnlockReleaseBuffer(buf);`
	`605`	`+ vacrelstats->scanned_pages++;`
`605`	`606`	`continue;`
`606`	`607`	`}`
`607`	`608`	`LockBuffer(buf, BUFFER_LOCK_UNLOCK);`