shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

B #5172: Detect remote image size (#465)

Browse Source
This commit is contained in:
Vlastimil Holer 2017-09-11 11:17:18 +02:00 committed by Ruben S. Montero
parent 107ee18380
commit 50e7464769
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/datastore_mad/remotes/libfs.sh
View File

@ -168,16 +168,27 @@ function fs_size {
case $1 in
http://*|https://*)
HEADERS=`curl -LIk --max-time 60 $1 2>&1`
HEADERS=`curl -LIk --max-time 60 "${1}" 2>&1`
if echo "$HEADERS" | grep -i -q "OpenNebula-AppMarket-Size"; then
# An AppMarket/Marketplace URL
SIZE=$(echo "$HEADERS" | grep -i "^OpenNebula-AppMarket-Size:" | tail -n1 | cut -d: -f2)
error=$?
else
# Not an AppMarket/Marketplace URL
SIZE=$(echo "$HEADERS" | grep -i "^Content-Length:" | tail -n1 | cut -d: -f2)
SIZE=$(echo "$HEADERS" | grep -i "^Content-Length:" | tail -n1 | cut -d: -f2 | tr -d "\r")
error=$?
# Try to download the image head and inspect via qemu-img
IMAGE=$(mktemp)
curl -Lk --max-time 60 "${1}" 2>/dev/null | head -c 65536 >${IMAGE}
QSIZE=$($QEMU_IMG info "${IMAGE}" | sed -n 's/.*(\([0-9]*\) bytes).*/\1/p')
rm "${IMAGE}" 2>/dev/null
if [ "${QSIZE}" -gt "${SIZE}" ]; then
SIZE="${QSIZE}"
fi
fi
error=$?
;;
*)
if [ -d "$1" ]; then