openstack/devstack
Code Issues Proposed changes

fix failing wget statements under -o errexit in vmdk upload routine

Browse Source 
Fix the case when uploaded image has no descriptor.
Refactored the code a bit

Tested:
1. monithic Sparse
2. monolithic flat
    2.1 flat file name mentioned in descriptor file
    2.1 flat file name not mentioned in descriptor file
3. descriptor header not found in the file
    3.1 image file name is *-flat, download descriptor
    3.2 image file name does not end with *-flat
4. file name contains all image properties

Change-Id: I0df9be5c2a1b9ed53cdb22d5cd40b94e56c48f37
Closes-bug: #1289664
This commit is contained in:
Sreeram Yerrapragada
2014-03-10 14:12:58 -07:00
parent 0dfbf9b4b9
commit 9c6d2840fd
1 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
functions
View File

@@ -122,7 +122,7 @@ function upload_image {
flat_fname="$(head -25 $IMAGE | { grep -G 'RW\|RDONLY [0-9]+ FLAT\|VMFS' $IMAGE || true; })" flat_fname="$(head -25 $IMAGE | { grep -G 'RW\|RDONLY [0-9]+ FLAT\|VMFS' $IMAGE || true; })"
flat_fname="${flat_fname#*\"}" flat_fname="${flat_fname#*\"}"
flat_fname="${flat_fname%?}" flat_fname="${flat_fname%?}"
if [[ -z "$flat_name" ]]; then if [[ -z "$flat_fname" ]]; then
flat_fname="$IMAGE_NAME-flat.vmdk" flat_fname="$IMAGE_NAME-flat.vmdk"
fi fi
path_len=`expr ${#image_url} - ${#IMAGE_FNAME}` path_len=`expr ${#image_url} - ${#IMAGE_FNAME}`
@@ -133,27 +133,16 @@ function upload_image {
if [[ ! -f $FILES/$flat_fname || \ if [[ ! -f $FILES/$flat_fname || \
"$(stat -c "%s" $FILES/$flat_fname)" = "0" ]]; then "$(stat -c "%s" $FILES/$flat_fname)" = "0" ]]; then
wget -c $flat_url -O $FILES/$flat_fname wget -c $flat_url -O $FILES/$flat_fname
if [[ $? -ne 0 ]]; then
echo "Flat disk not found: $flat_url"
flat_found=false
fi
fi
if $flat_found; then
IMAGE="$FILES/${flat_fname}"
fi fi
IMAGE="$FILES/${flat_fname}"
else else
IMAGE=$(echo $flat_url | sed "s/^file:\/\///g") IMAGE=$(echo $flat_url | sed "s/^file:\/\///g")
if [[ ! -f $IMAGE || "$(stat -c "%s" $IMAGE)" == "0" ]]; then if [[ ! -f $IMAGE || "$(stat -c "%s" $IMAGE)" == "0" ]]; then
echo "Flat disk not found: $flat_url" echo "Flat disk not found: $flat_url"
flat_found=false return 1
fi
if ! $flat_found; then
IMAGE=$(echo $image_url | sed "s/^file:\/\///g")
fi fi
fi fi
if $flat_found; then IMAGE_NAME="${flat_fname}"
IMAGE_NAME="${flat_fname}"
fi
vmdk_disktype="preallocated" vmdk_disktype="preallocated"
elif [[ "$vmdk_create_type" = "streamOptimized" ]]; then elif [[ "$vmdk_create_type" = "streamOptimized" ]]; then
vmdk_disktype="streamOptimized" vmdk_disktype="streamOptimized"
@@ -163,33 +152,27 @@ function upload_image {
if [[ ${IMAGE_NAME: -5} != "-flat" ]]; then if [[ ${IMAGE_NAME: -5} != "-flat" ]]; then
warn $LINENO "Expected filename suffix: '-flat'."` warn $LINENO "Expected filename suffix: '-flat'."`
`" Filename provided: ${IMAGE_NAME}" `" Filename provided: ${IMAGE_NAME}"
fi else
descriptor_fname="${IMAGE_NAME:0:${#IMAGE_NAME} - 5}.vmdk"
descriptor_fname="${IMAGE_NAME:0:${#IMAGE_NAME} - 5}.vmdk" path_len=`expr ${#image_url} - ${#IMAGE_FNAME}`
path_len=`expr ${#image_url} - ${#IMAGE_FNAME}` flat_path="${image_url:0:$path_len}"
flat_path="${image_url:0:$path_len}" descriptor_url=$flat_path$descriptor_fname
descriptor_url=$flat_path$descriptor_fname warn $LINENO "$descriptor_data_pair_msg"`
warn $LINENO "$descriptor_data_pair_msg"` `" Attempt to retrieve the descriptor *.vmdk: $descriptor_url"
`" Attempt to retrieve the descriptor *.vmdk: $descriptor_url" if [[ $flat_path != file* ]]; then
if [[ $flat_path != file* ]]; then if [[ ! -f $FILES/$descriptor_fname || \
if [[ ! -f $FILES/$descriptor_fname || \ "$(stat -c "%s" $FILES/$descriptor_fname)" = "0" ]]; then
"$(stat -c "%s" $FILES/$descriptor_fname)" = "0" ]]; then wget -c $descriptor_url -O $FILES/$descriptor_fname
wget -c $descriptor_url -O $FILES/$descriptor_fname fi
if [[ $? -ne 0 ]]; then descriptor_url="$FILES/$descriptor_fname"
warn $LINENO "Descriptor not found $descriptor_url" else
descriptor_found=false descriptor_url=$(echo $descriptor_url | sed "s/^file:\/\///g")
if [[ ! -f $descriptor_url || \
"$(stat -c "%s" $descriptor_url)" == "0" ]]; then
echo "Descriptor not found: $descriptor_url"
return 1
fi fi
fi fi
descriptor_url="$FILES/$descriptor_fname"
else
descriptor_url=$(echo $descriptor_url | sed "s/^file:\/\///g")
if [[ ! -f $descriptor_url || \
"$(stat -c "%s" $descriptor_url)" == "0" ]]; then
warn $LINENO "Descriptor not found $descriptor_url"
descriptor_found=false
fi
fi
if $descriptor_found; then
vmdk_adapter_type="$(head -25 $descriptor_url | { grep -a -F -m 1 'ddb.adapterType =' $descriptor_url || true; })" vmdk_adapter_type="$(head -25 $descriptor_url | { grep -a -F -m 1 'ddb.adapterType =' $descriptor_url || true; })"
vmdk_adapter_type="${vmdk_adapter_type#*\"}" vmdk_adapter_type="${vmdk_adapter_type#*\"}"
vmdk_adapter_type="${vmdk_adapter_type%?}" vmdk_adapter_type="${vmdk_adapter_type%?}"