mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
changed atomic_move to be more 'optimistic' which helps deal with corner
cases and avoid usless work. Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
This commit is contained in:
parent
8df6b48e6b
commit
dafbcf87d3
1 changed files with 31 additions and 20 deletions
|
@ -845,7 +845,9 @@ class AnsibleModule(object):
|
||||||
sys.stderr.write("could not cleanup %s: %s" % (tmpfile, e))
|
sys.stderr.write("could not cleanup %s: %s" % (tmpfile, e))
|
||||||
|
|
||||||
def atomic_move(self, src, dest):
|
def atomic_move(self, src, dest):
|
||||||
'''atomically move src to dest, copying attributes from dest, returns true on success'''
|
'''atomically move src to dest, copying attributes from dest, returns true on success
|
||||||
|
it uses os.rename to ensure this as it is an atomic operation, rest of the function is
|
||||||
|
to work around limitations, corner cases and ensure selinux context is saved if possible'''
|
||||||
context = None
|
context = None
|
||||||
if os.path.exists(dest):
|
if os.path.exists(dest):
|
||||||
try:
|
try:
|
||||||
|
@ -860,26 +862,35 @@ class AnsibleModule(object):
|
||||||
else:
|
else:
|
||||||
if self.selinux_enabled():
|
if self.selinux_enabled():
|
||||||
context = self.selinux_default_context(dest)
|
context = self.selinux_default_context(dest)
|
||||||
# Ensure file is on same partition to make replacement atomic
|
|
||||||
dest_dir = os.path.dirname(dest)
|
|
||||||
dest_file = os.path.basename(dest)
|
|
||||||
tmp_dest = "%s/.%s.%s.%s" % (dest_dir,dest_file,os.getpid(),time.time())
|
|
||||||
|
|
||||||
try: # leaves tmp file behind when sudo and not root
|
try:
|
||||||
if os.getenv("SUDO_USER") and os.getuid() != 0:
|
# Optimistically try a rename, solves some corner cases and can avoid useless work.
|
||||||
# cleanup will happen by 'rm' of tempdir
|
os.rename(src, dest)
|
||||||
shutil.copy(src, tmp_dest)
|
except (IOError,OSError), e:
|
||||||
else:
|
# only try workarounds for errno 18 (cross device) and 1 (not permited)
|
||||||
shutil.move(src, tmp_dest)
|
if e.errno != errno.EPERM and e.errno != errno.EXDEV:
|
||||||
if self.selinux_enabled():
|
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
|
||||||
self.set_context_if_different(tmp_dest, context, False)
|
|
||||||
os.rename(tmp_dest, dest)
|
dest_dir = os.path.dirname(dest)
|
||||||
if self.selinux_enabled():
|
dest_file = os.path.basename(dest)
|
||||||
# rename might not preserve context
|
tmp_dest = "%s/.%s.%s.%s" % (dest_dir,dest_file,os.getpid(),time.time())
|
||||||
self.set_context_if_different(dest, context, False)
|
|
||||||
except (shutil.Error, OSError, IOError), e:
|
try: # leaves tmp file behind when sudo and not root
|
||||||
self.cleanup(tmp_dest)
|
if os.getenv("SUDO_USER") and os.getuid() != 0:
|
||||||
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
|
# cleanup will happen by 'rm' of tempdir
|
||||||
|
shutil.copy(src, tmp_dest)
|
||||||
|
else:
|
||||||
|
shutil.move(src, tmp_dest)
|
||||||
|
if self.selinux_enabled():
|
||||||
|
self.set_context_if_different(tmp_dest, context, False)
|
||||||
|
os.rename(tmp_dest, dest)
|
||||||
|
except (shutil.Error, OSError, IOError), e:
|
||||||
|
self.cleanup(tmp_dest)
|
||||||
|
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
|
||||||
|
|
||||||
|
if self.selinux_enabled():
|
||||||
|
# rename might not preserve context
|
||||||
|
self.set_context_if_different(dest, context, False)
|
||||||
|
|
||||||
def run_command(self, args, check_rc=False, close_fds=False, executable=None, data=None, binary_data=False):
|
def run_command(self, args, check_rc=False, close_fds=False, executable=None, data=None, binary_data=False):
|
||||||
'''
|
'''
|
||||||
|
|
Loading…
Reference in a new issue