diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-10-20 11:24:37 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-10-20 11:32:18 -0400 |
| commit | f82ec32ac30ae7e3ec7c84067192535b2ff8ec0e (patch) | |
| tree | 929d4709a42149a4bbde12edad16183a96bcef6a /src/bin/pg_rewind/filemap.c | |
| parent | ec7db2b483e0ff247ed41612cdb5716022401fe6 (diff) | |
Rename "pg_xlog" directory to "pg_wal".
"xlog" is not a particularly clear abbreviation for "write-ahead log",
and it sometimes confuses users into believe that the contents of the
"pg_xlog" directory are not critical data, leading to unpleasant
consequences. So, rename the directory to "pg_wal".
This patch modifies pg_upgrade and pg_basebackup to understand both
the old and new directory layouts; the former is necessary given the
purpose of the tool, while the latter merely avoids an unnecessary
backward-compatibility break.
We may wish to consider renaming other programs, switches, and
functions which still use the old "xlog" naming to also refer to
"wal". However, that's still under discussion, so let's do just this
much for now.
Discussion: CAB7nPqTeC-8+zux8_-4ZD46V7YPwooeFxgndfsq5Rg8ibLVm1A@mail.gmail.com
Michael Paquier
Diffstat (limited to 'src/bin/pg_rewind/filemap.c')
| -rw-r--r-- | src/bin/pg_rewind/filemap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c index 9b00dc1cdc1..3905a5d6ce3 100644 --- a/src/bin/pg_rewind/filemap.c +++ b/src/bin/pg_rewind/filemap.c @@ -79,11 +79,11 @@ process_source_file(const char *path, file_type_t type, size_t newsize, return; /* - * Pretend that pg_xlog is a directory, even if it's really a symlink. We + * Pretend that pg_wal is a directory, even if it's really a symlink. We * don't want to mess with the symlink itself, nor complain if it's a * symlink in source but not in target or vice versa. */ - if (strcmp(path, "pg_xlog") == 0 && type == FILE_TYPE_SYMLINK) + if (strcmp(path, "pg_wal") == 0 && type == FILE_TYPE_SYMLINK) type = FILE_TYPE_DIRECTORY; /* @@ -120,7 +120,7 @@ process_source_file(const char *path, file_type_t type, size_t newsize, switch (type) { case FILE_TYPE_DIRECTORY: - if (exists && !S_ISDIR(statbuf.st_mode) && strcmp(path, "pg_xlog") != 0) + if (exists && !S_ISDIR(statbuf.st_mode) && strcmp(path, "pg_wal") != 0) { /* it's a directory in source, but not in target. Strange.. */ pg_fatal("\"%s\" is not a directory\n", localpath); @@ -296,7 +296,7 @@ process_target_file(const char *path, file_type_t type, size_t oldsize, /* * Like in process_source_file, pretend that xlog is always a directory. */ - if (strcmp(path, "pg_xlog") == 0 && type == FILE_TYPE_SYMLINK) + if (strcmp(path, "pg_wal") == 0 && type == FILE_TYPE_SYMLINK) type = FILE_TYPE_DIRECTORY; key.path = (char *) path; |