Fix missing fsync of SLRU directories.

macdice · macdice · commit c5a5bd0bb6ff · 2020-09-24T10:31:57.000+12:00
Harmonize behavior by moving reponsibility for fsyncing directories down into slru.c. In 10 and later, only the multixact directories were missed (see commit 1b02be2), and in older branches all SLRUs were missed. Back-patch to all supported releases. Reviewed-by: Andres Freund <andres@anarazel.de> Reviewed-by: Michael Paquier <michael@paquier.xyz> Discussion: https://postgr.es/m/CA%2BhUKGLtsTUOScnNoSMZ-2ZLv%2BwGh01J6kAo_DM8mTRq1sKdSQ%40mail.gmail.com
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
@@ -837,13 +837,6 @@ CheckPointCLOG(void)
 	/* Flush dirty CLOG pages to disk */
 	TRACE_POSTGRESQL_CLOG_CHECKPOINT_START(true);
 	SimpleLruFlush(ClogCtl, true);
-
-	/*
-	 * fsync pg_xact to ensure that any files flushed previously are durably
-	 * on disk.
-	 */
-	fsync_fname("pg_xact", true);
-
 	TRACE_POSTGRESQL_CLOG_CHECKPOINT_DONE(true);
 }
 
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
@@ -761,12 +761,6 @@ CheckPointCommitTs(void)
 {
 	/* Flush dirty CommitTs pages to disk */
 	SimpleLruFlush(CommitTsCtl, true);
-
-	/*
-	 * fsync pg_commit_ts to ensure that any files flushed previously are
-	 * durably on disk.
-	 */
-	fsync_fname("pg_commit_ts", true);
 }
 
 /*
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
@@ -1159,6 +1159,10 @@ SimpleLruFlush(SlruCtl ctl, bool allow_redirtied)
 	}
 	if (!ok)
 		SlruReportIOError(ctl, pageno, InvalidTransactionId);
+
+	/* Ensure that directory entries for new files are on disk. */
+	if (ctl->do_fsync)
+		fsync_fname(ctl->Dir, true);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -761,12 +761,6 @@ CheckPointCommitTs(void)`
`761`	`761`	`{`
`762`	`762`	`/* Flush dirty CommitTs pages to disk */`
`763`	`763`	`SimpleLruFlush(CommitTsCtl, true);`
`764`		`-`
`765`		`- /*`
`766`		`- * fsync pg_commit_ts to ensure that any files flushed previously are`
`767`		`- * durably on disk.`
`768`		`- */`
`769`		`- fsync_fname("pg_commit_ts", true);`
`770`	`764`	`}`
`771`	`765`
`772`	`766`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1159,6 +1159,10 @@ SimpleLruFlush(SlruCtl ctl, bool allow_redirtied)`
`1159`	`1159`	`}`
`1160`	`1160`	`if (!ok)`
`1161`	`1161`	`SlruReportIOError(ctl, pageno, InvalidTransactionId);`
	`1162`	`+`
	`1163`	`+ /* Ensure that directory entries for new files are on disk. */`
	`1164`	`+ if (ctl->do_fsync)`
	`1165`	`+ fsync_fname(ctl->Dir, true);`
`1162`	`1166`	`}`
`1163`	`1167`
`1164`	`1168`	`/*`