From dc11a5434a001bdf23a43f8a1f4f38d7e9779036 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 27 May 2015 23:33:29 -0400
Subject: [PATCH] GCE kube-up; write the marker only after we have uploaded the
 file

We can't write the marker before we upload the file, otherwise anything
that interrupts the upload will leave a corrupted upload that we believe
to be current.
---
 cluster/gce/util.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index cc9c243744a..983c2f872fa 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -145,10 +145,10 @@ function already-staged() {
   local -r file=$1
   local -r newsum=$2
 
-  [[ -e "${file}.sha1" ]] || return 1
+  [[ -e "${file}.uploaded.sha1" ]] || return 1
 
   local oldsum
-  oldsum=$(cat "${file}.sha1")
+  oldsum=$(cat "${file}.uploaded.sha1")
 
   [[ "${oldsum}" == "${newsum}" ]]
 }
@@ -166,6 +166,7 @@ function copy-if-not-staged() {
     echo "${server_hash}" > "${tar}.sha1"
     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
+    echo "${server_hash}" > "${tar}.uploaded.sha1"
   fi
 }