Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcb86785

Browse files
committed
Fix fsync-at-startup code to not treat errors as fatal.
Commit2ce439f introduced a rather seriousregression, namely that if its scan of the data directory came across anyun-fsync-able files, it would fail and thereby prevent database startup.Worse yet, symlinks to such files also caused the problem, which meant thatcrash restart was guaranteed to fail on certain common installations suchas older Debian.After discussion, we agreed that (1) failure to start is worse than anyconsequence of not fsync'ing is likely to be, therefore treat all errorsin this code as nonfatal; (2) we should not chase symlinks other thanthose that are expected to exist, namely pg_xlog/ and tablespace linksunder pg_tblspc/. The latter restriction avoids possibly fsync'ing amuch larger part of the filesystem than intended, if the user has leftrandom symlinks hanging about in the data directory.This commit takes care of that and also does some code beautification,mainly moving the relevant code into fd.c, which seems a much better placefor it than xlog.c, and making sure that the conditional compilation forthe pre_sync_fname pass has something to do with whether pg_flush_dataworks.I also relocated the call site in xlog.c down a few lines; it seems abit silly to be doing this before ValidateXLOGDirectoryStructure().The similar logic in initdb.c ought to be made to match this, but thatchange is noncritical and will be dealt with separately.Back-patch to all active branches, like the prior commit.Abhijit Menon-Sen and Tom Lane
1 parentee8b93c commitcb86785

File tree

3 files changed

+263
-117
lines changed

3 files changed

+263
-117
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,6 @@ static bool read_backup_label(XLogRecPtr *checkPointLoc,
678678
staticvoidrm_redo_error_callback(void*arg);
679679
staticintget_sync_bit(intmethod);
680680

681-
staticvoidfsync_pgdata(char*datadir);
682-
683681
/*
684682
* Insert an XLOG record having the specified RMID and info bytes,
685683
* with the body of the record being the data chunk(s) described by
@@ -6230,18 +6228,6 @@ StartupXLOG(void)
62306228
(errmsg("database system was interrupted; last known up at %s",
62316229
str_time(ControlFile->time))));
62326230

6233-
/*
6234-
* If we previously crashed, there might be data which we had written,
6235-
* intending to fsync it, but which we had not actually fsync'd yet.
6236-
* Therefore, a power failure in the near future might cause earlier
6237-
* unflushed writes to be lost, even though more recent data written to
6238-
* disk from here on would be persisted. To avoid that, fsync the entire
6239-
* data directory.
6240-
*/
6241-
if (ControlFile->state!=DB_SHUTDOWNED&&
6242-
ControlFile->state!=DB_SHUTDOWNED_IN_RECOVERY)
6243-
fsync_pgdata(data_directory);
6244-
62456231
/* This is just to allow attaching to startup process with a debugger */
62466232
#ifdefXLOG_REPLAY_DELAY
62476233
if (ControlFile->state!=DB_SHUTDOWNED)
@@ -6265,6 +6251,18 @@ StartupXLOG(void)
62656251
*/
62666252
RelationCacheInitFileRemove();
62676253

6254+
/*
6255+
* If we previously crashed, there might be data which we had written,
6256+
* intending to fsync it, but which we had not actually fsync'd yet.
6257+
* Therefore, a power failure in the near future might cause earlier
6258+
* unflushed writes to be lost, even though more recent data written to
6259+
* disk from here on would be persisted. To avoid that, fsync the entire
6260+
* data directory.
6261+
*/
6262+
if (ControlFile->state!=DB_SHUTDOWNED&&
6263+
ControlFile->state!=DB_SHUTDOWNED_IN_RECOVERY)
6264+
SyncDataDirectory();
6265+
62686266
/*
62696267
* Initialize on the assumption we want to recover to the same timeline
62706268
* that's active according to pg_control.
@@ -10838,31 +10836,3 @@ WakeupRecovery(void)
1083810836
{
1083910837
SetLatch(&XLogCtl->recoveryWakeupLatch);
1084010838
}
10841-
10842-
/*
10843-
* Issue fsync recursively on PGDATA and all its contents.
10844-
*/
10845-
staticvoid
10846-
fsync_pgdata(char*datadir)
10847-
{
10848-
if (!enableFsync)
10849-
return;
10850-
10851-
/*
10852-
* If possible, hint to the kernel that we're soon going to fsync
10853-
* the data directory and its contents.
10854-
*/
10855-
#if defined(HAVE_SYNC_FILE_RANGE)|| \
10856-
(defined(USE_POSIX_FADVISE)&& defined(POSIX_FADV_DONTNEED))
10857-
walkdir(datadir,pre_sync_fname);
10858-
#endif
10859-
10860-
/*
10861-
* Now we do the fsync()s in the same order.
10862-
*
10863-
* It's important to fsync the destination directory itself as individual
10864-
* file fsyncs don't guarantee that the directory entry for the file is
10865-
* synced.
10866-
*/
10867-
walkdir(datadir,fsync_fname);
10868-
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp