diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-05-23 10:59:55 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-05-23 10:59:55 -0400 |
| commit | 1d96c1b91a4b7da6288ee63671a234b557ff5ccf (patch) | |
| tree | d87bb1d8dc0ae7f853e33fa38759ade52a8094df /src/backend/utils/init/globals.c | |
| parent | b06d8e58b5ac257c2119312c47c4a0f233c5e0ca (diff) | |
Fix incorrect ordering of operations in pg_resetwal and pg_rewind.
Commit c37b3d08c dropped its added GetDataDirectoryCreatePerm call into
the wrong place in pg_resetwal.c, namely after the chdir to DataDir.
That broke invocations using a relative path, as reported by Tushar Ahuja.
We could have left it where it was and changed the argument to be ".",
but that'd result in a rather confusing error message in event of a
failure, so re-ordering seems like a better solution.
Similarly reorder operations in pg_rewind.c. The issue there is that
it doesn't seem like a good idea to do any actual operations before the
not-root check (on Unix) or the restricted token acquisition (on Windows).
I don't know that this is an actual bug, but I'm definitely not convinced
that it isn't, either.
Assorted other code review for c37b3d08c and da9b580d8: fix some
misspelled or otherwise badly worded comments, put the #include for
<sys/stat.h> where it actually belongs, etc.
Discussion: https://postgr.es/m/aeb9c3a7-3c3f-a57f-1a18-c8d4fcdc2a1f@enterprisedb.com
Diffstat (limited to 'src/backend/utils/init/globals.c')
| -rw-r--r-- | src/backend/utils/init/globals.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 36ffd874a40..f7d6617a138 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -18,8 +18,6 @@ */ #include "postgres.h" -#include <sys/stat.h> - #include "common/file_perm.h" #include "libpq/libpq-be.h" #include "libpq/pqcomm.h" @@ -63,7 +61,7 @@ struct Latch *MyLatch; char *DataDir = NULL; /* - * Mode of the data directory. The default is 0700 but may it be changed in + * Mode of the data directory. The default is 0700 but it may be changed in * checkDataDir() to 0750 if the data directory actually has that mode. */ int data_directory_mode = PG_DIR_MODE_OWNER; |