openstack/devstack
Code Issues Proposed changes

Fix partial download problem

Browse Source 
(1) when checksum fails, better delete the broken files and try the second time;
(2) amazon s3 is not good in mainland China, better try one more time with wget

Change-Id: I24ee73f216b78bd80564863cd335e5d5a9b56360
This commit is contained in:
yuanke wei 2017-09-17 22:18:07 +08:00
parent f56a0ae2ec
commit c652a498fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@ -63,7 +63,7 @@ function get_extra_file {
if [[ $file_url != file* ]]; then
# If the file isn't cache, download it
if [[ ! -f $FILES/$file_name ]]; then
wget --progress=dot:giga -c $file_url -O $FILES/$file_name
wget --progress=dot:giga -t 2 -c $file_url -O $FILES/$file_name
if [[ $? -ne 0 ]]; then
die "$file_url could not be downloaded"
fi

4
lib/etcd3
View File

@ -98,8 +98,8 @@ function install_etcd3 {
etcd_file="$(get_extra_file $ETCD_DOWNLOAD_LOCATION)"
if [ ! -f "$FILES/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then
echo "${ETCD_SHA256} $etcd_file" > $FILES/etcd.sha256sum
# NOTE(sdague): this should go fatal if this fails
sha256sum -c $FILES/etcd.sha256sum
# NOTE(yuanke wei): rm the damaged file when checksum fails
sha256sum -c $FILES/etcd.sha256sum || (sudo rm -f $etcd_file; exit 1)
tar xzvf $etcd_file -C $FILES
sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd