database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-07 00:36:50 +03:00
Code Activity

pg_alterckey: adjust doc build and Win32 sleep/open build fails

Browse Source 
Fix for commit 62afb42a7f.

Reported-by: Tom Lane

Discussion: https://postgr.es/m/1252111.1608953815@sss.pgh.pa.us

Backpatch-through: master
This commit is contained in:
Bruce Momjian
2020-12-25 22:47:16 -05:00
parent 7705f8ca03
commit 82f8c45be5
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/pg_alterckey/pg_alterckey.c
View File

@ -343,16 +343,17 @@ create_lockfile(void)
unlink(pid_path);
/* Sleep to reduce the likelihood of concurrent unlink */
sleep(2);
pg_usleep(2000000L); /* 2 seconds */
}
/* Create our own lockfile? */
lock_fd = open(pid_path, O_RDWR | O_CREAT | O_EXCL
#ifdef WIN32
/* delete on close */
| O_TEMPORARY
#ifndef WIN32
lock_fd = open(pid_path, O_RDWR | O_CREAT | O_EXCL, pg_file_create_mode);
#else
/* delete on close */
lock_fd = open(pid_path, O_RDWR | O_CREAT | O_EXCL | O_TEMPORARY,
pg_file_create_mode);
#endif
, pg_file_create_mode);
if (lock_fd == -1)
{