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

Commit680f89e

Browse files
committed
Fix initial sync of slot parent directory when restoring status
At the beginning of recovery, information from replication slots isrecovered from disk to memory. In order to ensure the durability of theinformation, the status file as well as its parent directory aresynced. It happens that the sync on the parent directory was donedirectly using the status file path, which is logically incorrect, andthe current code has been doing a sync on the same object twice in arow.Reported-by: Konstantin KnizhnikDiagnosed-by: Konstantin KnizhnikAuthor: Michael PaquierDiscussion:https://postgr.es/m/9eb1a6d5-b66f-2640-598d-c5ea46b8f68a@postgrespro.ruBackpatch-through: 9.4-
1 parent3099eec commit680f89e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

‎src/backend/replication/slot.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,7 @@ RestoreSlotFromDisk(const char *name)
13521352
{
13531353
ReplicationSlotOnDiskcp;
13541354
inti;
1355+
charslotdir[MAXPGPATH+12];
13551356
charpath[MAXPGPATH+22];
13561357
intfd;
13571358
boolrestored= false;
@@ -1361,13 +1362,14 @@ RestoreSlotFromDisk(const char *name)
13611362
/* no need to lock here, no concurrent access allowed yet */
13621363

13631364
/* delete temp file if it exists */
1364-
sprintf(path,"pg_replslot/%s/state.tmp",name);
1365+
sprintf(slotdir,"pg_replslot/%s",name);
1366+
sprintf(path,"%s/state.tmp",slotdir);
13651367
if (unlink(path)<0&&errno!=ENOENT)
13661368
ereport(PANIC,
13671369
(errcode_for_file_access(),
13681370
errmsg("could not remove file \"%s\": %m",path)));
13691371

1370-
sprintf(path,"pg_replslot/%s/state",name);
1372+
sprintf(path,"%s/state",slotdir);
13711373

13721374
elog(DEBUG1,"restoring replication slot from \"%s\"",path);
13731375

@@ -1402,7 +1404,7 @@ RestoreSlotFromDisk(const char *name)
14021404

14031405
/* Also sync the parent directory */
14041406
START_CRIT_SECTION();
1405-
fsync_fname(path, true);
1407+
fsync_fname(slotdir, true);
14061408
END_CRIT_SECTION();
14071409

14081410
/* read part of statefile that's guaranteed to be version independent */
@@ -1481,13 +1483,11 @@ RestoreSlotFromDisk(const char *name)
14811483
*/
14821484
if (cp.slotdata.persistency!=RS_PERSISTENT)
14831485
{
1484-
sprintf(path,"pg_replslot/%s",name);
1485-
1486-
if (!rmtree(path, true))
1486+
if (!rmtree(slotdir, true))
14871487
{
14881488
ereport(WARNING,
14891489
(errcode_for_file_access(),
1490-
errmsg("could not remove directory \"%s\"",path)));
1490+
errmsg("could not remove directory \"%s\"",slotdir)));
14911491
}
14921492
fsync_fname("pg_replslot", true);
14931493
return;

0 commit comments

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