RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2024-12-23 23:42:35 +00:00
Code Issues Projects Releases Wiki Activity

abuild-fetch: aquire a second lock using flock(2)

Browse Source 
It seems that POSIX record lock does not work across namespaces. Use a
second lock using flock.

see https://gitlab.alpinelinux.org/alpine/abuild/-/issues/10026
This commit is contained in:
Natanael Copa 2021-04-20 17:05:40 +02:00
parent 1772495d29
commit 281720ec39
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
abuild-fetch.c
View File

@ -23,6 +23,7 @@ THE SOFTWARE.
*/ */
#include <sys/file.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <err.h> #include <err.h>
@ -90,6 +91,7 @@ static int aquire_lock(const char *lockfile)
if (lockfd < 0) if (lockfd < 0)
err(1, "%s", lockfile); err(1, "%s", lockfile);
/* create NFS-safe lock */
if (fcntl(lockfd, F_SETLK, &fl) < 0) { if (fcntl(lockfd, F_SETLK, &fl) < 0) {
int i; int i;
printf("Waiting for %s ...\n", lockfile); printf("Waiting for %s ...\n", lockfile);
@ -102,11 +104,20 @@ static int aquire_lock(const char *lockfile)
sleep(1); sleep(1);
} }
} }
int r = flock(lockfd, LOCK_EX);
if (r == -1)
err(1, "flock: %s", lockfile);
return lockfd; return lockfd;
} }
static void release_lock(int lockfd) static void release_lock(int lockfd)
{ {
int r = flock(lockfd, LOCK_UN);
if (r == -1)
err(1, "flock");
close(lockfd); close(lockfd);
} }