Make filesytem more resilient to concurrent updates.
- Uses O_CREAT for touch (for guaranteed atomic open on NFS, multi-node) - Ignore concurrent create errors in mkdirp
This commit is contained in:
parent
326e2f7f66
commit
bd7a591df1
@ -251,7 +251,11 @@ def mkdirp(*paths):
|
|||||||
"""Creates a directory, as well as parent directories if needed."""
|
"""Creates a directory, as well as parent directories if needed."""
|
||||||
for path in paths:
|
for path in paths:
|
||||||
if not os.path.exists(path):
|
if not os.path.exists(path):
|
||||||
|
try:
|
||||||
os.makedirs(path)
|
os.makedirs(path)
|
||||||
|
except OSError as e:
|
||||||
|
if e.errno != errno.EEXIST or not os.path.isdir(path):
|
||||||
|
raise e
|
||||||
elif not os.path.isdir(path):
|
elif not os.path.isdir(path):
|
||||||
raise OSError(errno.EEXIST, "File already exists", path)
|
raise OSError(errno.EEXIST, "File already exists", path)
|
||||||
|
|
||||||
@ -291,8 +295,14 @@ def hide_files(*file_list):
|
|||||||
|
|
||||||
def touch(path):
|
def touch(path):
|
||||||
"""Creates an empty file at the specified path."""
|
"""Creates an empty file at the specified path."""
|
||||||
with open(path, 'a'):
|
perms = (os.O_WRONLY | os.O_CREAT | os.O_NONBLOCK | os.O_NOCTTY)
|
||||||
|
fd = None
|
||||||
|
try:
|
||||||
|
fd = os.open(path, perms)
|
||||||
os.utime(path, None)
|
os.utime(path, None)
|
||||||
|
finally:
|
||||||
|
if fd is not None:
|
||||||
|
os.close(fd)
|
||||||
|
|
||||||
|
|
||||||
def touchp(path):
|
def touchp(path):
|
||||||
|
Loading…
Reference in New Issue
Block a user