shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-26 09:57:23 +03:00
Code Releases Wiki Activity

B #3244: Prevent race condition in ln.ssh (#3935)

Browse Source 
Don't evaluate presence of the SRC_SNAP_DIR on hypervisor,
but rather on the frontend to prevent race condition.
This commit is contained in:
Jan Orel 2019-11-12 15:00:39 +01:00 committed by Ruben S. Montero
parent d4495e5ec0
commit d62585174e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tm_mad/qcow2/ln.ssh
View File

@ -49,7 +49,6 @@ DST_SNAP_DIR=${DST_PATH}.snap
DST_FILE=`basename $DST_PATH`
DST_DIR=`dirname $DST_PATH`
SRC_HOST=`arg_host $SRC`
SRC_PATH=`arg_path $SRC`
SRC_SNAP_DIR=${SRC_PATH}.snap
@ -64,20 +63,25 @@ ssh_make_path $DST_HOST $DST_DIR 'ssh'
#-------------------------------------------------------------------------------
log "Copying $SRC_PATH in $DST"
if [ -d "${SRC_SNAP_DIR}" ]; then
CP_CMD=$(cat <<EOT
for F in \$(ls ${SRC_SNAP_DIR}); do
if [ -f ${SRC_SNAP_DIR}/\$F ]; then
cp ${SRC_SNAP_DIR}/\$F ${DST_SNAP_DIR}
fi
done
EOT
)
else
CP_CMD="cp ${SRC_PATH} ${DST_SNAP_DIR}/0"
fi
CMD=$(cat <<EOT
set -ex -o pipefail
mkdir -p "${DST_SNAP_DIR}"
cd "${DST_SNAP_DIR}"
if [ -d ${SRC_SNAP_DIR} ]; then
for F in \$(ls ${SRC_SNAP_DIR}); do
if [ -f ${SRC_SNAP_DIR}/\$F ]; then
cp ${SRC_SNAP_DIR}/\$F .
fi
done
else
cp ${SRC_PATH} 0
fi
${CP_CMD}
rm -f "${DST_FILE}.snap"
ln -sf "." "${DST_FILE}.snap"