diff options
Diffstat (limited to 'src/backend/replication/basebackup.c')
| -rw-r--r-- | src/backend/replication/basebackup.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index fa75930c9f8..ffc7e586dba 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -346,7 +346,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir) TimeLineID tli; /* - * I'd rather not worry about timelines here, so scan pg_xlog and + * I'd rather not worry about timelines here, so scan pg_wal and * include all WAL files in the range between 'startptr' and 'endptr', * regardless of the timeline the file is stamped with. If there are * some spurious WAL files belonging to timelines that don't belong in @@ -359,11 +359,11 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir) XLByteToPrevSeg(endptr, endsegno); XLogFileName(lastoff, ThisTimeLineID, endsegno); - dir = AllocateDir("pg_xlog"); + dir = AllocateDir("pg_wal"); if (!dir) ereport(ERROR, - (errmsg("could not open directory \"%s\": %m", "pg_xlog"))); - while ((de = ReadDir(dir, "pg_xlog")) != NULL) + (errmsg("could not open directory \"%s\": %m", "pg_wal"))); + while ((de = ReadDir(dir, "pg_wal")) != NULL) { /* Does it look like a WAL segment, and is it in the range? */ if (IsXLogFileName(de->d_name) && @@ -401,7 +401,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir) qsort(walFiles, nWalFiles, sizeof(char *), compareWalFileNames); /* - * There must be at least one xlog file in the pg_xlog directory, + * There must be at least one xlog file in the pg_wal directory, * since we are doing backup-including-xlog. */ if (nWalFiles < 1) @@ -1054,23 +1054,23 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces, } /* - * We can skip pg_xlog, the WAL segments need to be fetched from the + * We can skip pg_wal, the WAL segments need to be fetched from the * WAL archive anyway. But include it as an empty directory anyway, so * we get permissions right. */ - if (strcmp(pathbuf, "./pg_xlog") == 0) + if (strcmp(pathbuf, "./pg_wal") == 0) { - /* If pg_xlog is a symlink, write it as a directory anyway */ + /* If pg_wal is a symlink, write it as a directory anyway */ size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly); /* * Also send archive_status directory (by hackishly reusing * statbuf from above ...). */ - size += _tarWriteHeader("./pg_xlog/archive_status", NULL, &statbuf, + size += _tarWriteHeader("./pg_wal/archive_status", NULL, &statbuf, sizeonly); - continue; /* don't recurse into pg_xlog */ + continue; /* don't recurse into pg_wal */ } /* Allow symbolic links in pg_tblspc only */ |