Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.0.0] Open the client lock file with O_CLOEXEC so we don't have to call fcntl(F_SETFD) later. #24185

Merged
merged 1 commit into from
Nov 4, 2024
Merged

[8.0.0] Open the client lock file with O_CLOEXEC so we don't have to call fcntl(F_SETFD) later. #24185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/cpp/blaze_util_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
#ifndef BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_
#define BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_

#include <cinttypes>
#include <stdint.h>

#include <map>
#include <memory>
#include <string>
Expand Down Expand Up @@ -206,7 +207,7 @@ struct BlazeLock {
};

// Acquires a lock on the output base. Exits if the lock cannot be acquired.
// Sets ``lock`` to a value that can subsequently be passed to ReleaseLock().
// Sets `blaze_lock` to a value that can be later passed to ReleaseLock().
// Returns the number of milliseconds spent with waiting for the lock.
uint64_t AcquireLock(const blaze_util::Path& output_base, bool batch_mode,
bool block, BlazeLock* blaze_lock);
Expand Down
18 changes: 8 additions & 10 deletions src/main/cpp/blaze_util_posix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <signal.h>
#include <spawn.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
Expand Down Expand Up @@ -636,24 +637,21 @@ static int setlk(int fd, struct flock *lock) {
uint64_t AcquireLock(const blaze_util::Path& output_base, bool batch_mode,
bool block, BlazeLock* blaze_lock) {
blaze_util::Path lockfile = output_base.GetRelative("lock");
int lockfd = open(lockfile.AsNativePath().c_str(), O_CREAT | O_RDWR, 0644);

int flags = O_CREAT | O_RDWR;
// Keep server from inheriting a useless fd if we are not in batch mode.
if (!batch_mode) {
flags |= O_CLOEXEC;
}

int lockfd = open(lockfile.AsNativePath().c_str(), flags, 0644);
if (lockfd < 0) {
string err = GetLastErrorString();
BAZEL_DIE(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR)
<< "cannot open lockfile '" << lockfile.AsPrintablePath()
<< "' for writing: " << err;
}

// Keep server from inheriting a useless fd if we are not in batch mode
if (!batch_mode) {
string err = GetLastErrorString();
if (fcntl(lockfd, F_SETFD, FD_CLOEXEC) == -1) {
BAZEL_DIE(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR)
<< "fcntl(F_SETFD) failed for lockfile: " << err;
}
}

struct flock lock = {};
lock.l_type = F_WRLCK;
lock.l_whence = SEEK_SET;
Expand Down
Loading