Skip to content

Add symlink locking for filesystems that do not support hardlinks #1708

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

Merged
merged 3 commits into from
Apr 13, 2024
Merged

Add symlink locking for filesystems that do not support hardlinks #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55052c9
Signed-off-by: Robert Minsk <[email protected]>
cfxegbert Apr 4, 2024
b18f833
Update src/rezplugins/package_repository/rezconfig documentation
cfxegbert Apr 8, 2024
d45e5d3
docs: Remove redudant wording about link, symlink, and mkdir
cfxegbert Apr 8, 2024
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
4 changes: 3 additions & 1 deletion src/rezplugins/package_repository/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ class FileSystemPackageRepository(PackageRepository):
"""
schema_dict = {"file_lock_timeout": int,
"file_lock_dir": Or(None, str),
"file_lock_type": Or("default", "link", "mkdir"),
"file_lock_type": Or("default", "link", "mkdir", "symlink"),
"package_filenames": [str]}

building_prefix = ".building"
Expand Down Expand Up @@ -973,6 +973,8 @@ def _lock_package(self, package_name, package_version=None):
from rez.vendor.lockfile.mkdirlockfile import MkdirLockFile as LockFile
elif _settings.file_lock_type == 'link':
from rez.vendor.lockfile.linklockfile import LinkLockFile as LockFile
elif _settings.file_lock_type == 'symlink':
from rez.vendor.lockfile.symlinklockfile import SymlinkLockFile as LockFile

path = self.location

Expand Down
5 changes: 2 additions & 3 deletions src/rezplugins/package_repository/rezconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@

filesystem = {
# The mechanism used to create the lockfile. If set to 'default', this will
# use hardlinks if the 'os.link' method is present, otherwise mkdir is used.
# It can also be explicitly set to use only 'hardlink', or only 'mkdir'.
# Valid options are 'default', 'mkdir', or 'hardlink'
# use hardlinks (link) if the 'os.link' method is present, otherwise mkdir is used.
# Valid options are 'default', 'mkdir', 'link', or 'symlink'
"file_lock_type": "default",

# The timeout to use when creating file locks. This is done when a variant is
Expand Down