github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8904 from justinsb/fix_8903 

GCE kube-up; write the marker only after we have uploaded the file
pull/6/head
Tim Hockin 2015-05-28 15:30:47 -07:00
parent 2cadd4c86e dc11a5434a
commit 4ac239499b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/gce/util.sh
View File

@ -149,10 +149,10 @@ function already-staged() {
local -r file=$1 local -r file=$1
local -r newsum=$2 local -r newsum=$2
[[ -e "${file}.sha1" ]] || return 1 [[ -e "${file}.uploaded.sha1" ]] || return 1
local oldsum local oldsum
oldsum=$(cat "${file}.sha1") oldsum=$(cat "${file}.uploaded.sha1")
[[ "${oldsum}" == "${newsum}" ]] [[ "${oldsum}" == "${newsum}" ]]
} }
@ -170,6 +170,7 @@ function copy-if-not-staged() {
echo "${server_hash}" > "${tar}.sha1" echo "${server_hash}" > "${tar}.sha1"
gsutil -m -q -h "Cache-Control:private, max-age=0" cp "${tar}" "${tar}.sha1" "${staging_path}" gsutil -m -q -h "Cache-Control:private, max-age=0" cp "${tar}" "${tar}.sha1" "${staging_path}"
gsutil -m acl ch -g all:R "${gs_url}" "${gs_url}.sha1" >/dev/null 2>&1 gsutil -m acl ch -g all:R "${gs_url}" "${gs_url}.sha1" >/dev/null 2>&1
echo "${server_hash}" > "${tar}.uploaded.sha1"
fi fi
} }