Skip to content

Fix lock permission #7361

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

Open
cih9088 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix lock permission #7361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36be4f
fix: accomodate acl
cih9088 Jan 7, 2025
8c33a17
style: make ruff happy
cih9088 Jan 7, 2025
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
9 changes: 5 additions & 4 deletions src/datasets/utils/_filelock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"""Utilities to handle file locking in `datasets`."""

import os
from pathlib import Path

from filelock import FileLock as FileLock_
from filelock import UnixFileLock
Expand All @@ -32,13 +33,13 @@ class FileLock(FileLock_):
MAX_FILENAME_LENGTH = 255

def __init__(self, lock_file, *args, **kwargs):
lock_file = self.hash_filename_if_too_long(lock_file)
# instaed of usimg umask, create a lock file to accomodate ACL
Path(lock_file).touch()
# The "mode" argument is required if we want to use the current umask in filelock >= 3.10
# In previous previous it was already using the current umask.
if "mode" not in kwargs and version.parse(_filelock_version) >= version.parse("3.10.0"):
umask = os.umask(0o666)
os.umask(umask)
kwargs["mode"] = 0o666 & ~umask
lock_file = self.hash_filename_if_too_long(lock_file)
kwargs["mode"] = os.stat(lock_file).st_mode
super().__init__(lock_file, *args, **kwargs)

@classmethod
Expand Down