particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util/fscache: avoid RENAME_NOREPLACE on commit

Browse source 
We used to commit cache-entries with a rename+RENAME_NOREPLACE. This,
however, is not available on NFS. Change the code to use `os.rename()`
and rely on the _documented_ kernel behavior that non-empty target
directories cannot be replaced.

Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com>
This commit is contained in:
David Rheinsberg 2022-12-19 10:23:10 +01:00
parent e6b77ac7df
commit 2c18a54e4d
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
osbuild/util/fscache.py
View file

@ -900,12 +900,16 @@ class FsCache(contextlib.AbstractContextManager, os.PathLike):
# As last step move the entry to the desired location. If the
# target name is already taken, we bail out and pretend the
# entry was immediately overwritten by another one.
#
# Preferably, we used RENAME_NOREPLACE, but this is not
# available on all file-systems. Hence, we rely on the fact
# that non-empty directories cannot be replaced, so we
# automatically get RENAME_NOREPLACE behavior.
path_name = self._path(self._dirname_objects, name)
try:
self._libc.renameat2(
oldpath=path_uuid.encode(),
newpath=path_name.encode(),
flags=self._libc.RENAME_NOREPLACE,
os.rename(
src=path_uuid,
dst=path_name,
)
except OSError as e:
ignore = [errno.EEXIST, errno.ENOTDIR, errno.ENOTEMPTY]