saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for the race condition, details are here: https://github.com/saltstack/salt/issues/33223#issuecomment-386117236

Browse source
This commit is contained in:
Kirill Timofeev 2018-05-02 14:16:04 -07:00 • committed by rallytime
parent 85284caaf9
commit 1abe05207c
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/fileclient.py
View file

@ -13,6 +13,7 @@ import string
import shutil
import ftplib
from tornado.httputil import parse_response_start_line, HTTPHeaders, HTTPInputError
import uuid
# Import salt libs
from salt.exceptions import (
@ -1162,11 +1163,16 @@ class RemoteClient(Client):
load['gzip'] = gzip
fn_ = None
dest_tmp = None
if dest:
destdir = os.path.dirname(dest)
if not os.path.isdir(destdir):
if makedirs:
os.makedirs(destdir)
try:
os.makedirs(destdir)
except OSError as exc:
if exc.errno != errno.EEXIST: # ignore if it was there already
raise
else:
return False
# We need an open filehandle here, that's why we're not using a
@ -1217,11 +1223,12 @@ class RemoteClient(Client):
saltenv,
cachedir=cachedir) as cache_dest:
dest = cache_dest
dest_tmp = "{0}/{1}".format(os.path.dirname(dest), str(uuid.uuid4()))
# If a directory was formerly cached at this path, then
# remove it to avoid a traceback trying to write the file
if os.path.isdir(dest):
salt.utils.files.rm_rf(dest)
fn_ = salt.utils.files.fopen(dest, 'wb+')
fn_ = salt.utils.files.fopen(dest_tmp, 'wb+')
if data.get('gzip', None):
data = salt.utils.gzip_util.uncompress(data['data'])
else:
@ -1252,6 +1259,8 @@ class RemoteClient(Client):
if fn_:
fn_.close()
if dest_tmp:
os.rename(dest_tmp, dest)
log.info(
'Fetching file from saltenv \'%s\', ** done ** \'%s\'',
saltenv, path