From a25f12bbc4886c93d423ca3fa3e74907c6d6e4a6 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 26 Jun 2013 11:44:16 -0400
Subject: [PATCH] fix(update_distfiles): Add option to control gsutil's
 parallelism

gsutil can be hard to follow when parallel upload/downloads are enabled.
"I see it is transferring something, but what?" So this provides an
option to disable that for debugging purposes.
---
 update_distfiles | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/update_distfiles b/update_distfiles
index 8b2fc316a8..cda9e7f535 100755
--- a/update_distfiles
+++ b/update_distfiles
@@ -8,6 +8,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 DEFINE_boolean dry_run ${FLAGS_FALSE} "Trial run, makes no changes."
+DEFINE_boolean parallel ${FLAGS_TRUE} "Enable parallelism in gsutil."
 DEFINE_boolean upload ${FLAGS_FALSE} "Upload distfile mirror via gsutil."
 
 # FIXME(marineam): We need to add gs support to emirrordist so it
@@ -27,6 +28,12 @@ if [[ $# -eq 0 ]]; then
     eval set -- portage-stable coreos
 fi
 
+GSUTIL_OPTS=
+if [[ ${FLAGS_parallel} -eq ${FLAGS_TRUE} ]]; then
+    GSUTIL_OPTS="-m"
+fi
+
+
 update_local_mirror() {
     local repo_name="$1"
     local repo_mirror="${MIRROR_ROOT}/$repo_name"
@@ -60,11 +67,11 @@ upload_mirror() {
     local remote_mirror="${UPLOAD_ROOT}/$repo_name"
 
     info "Uploading public distfiles for $repo_name"
-    gsutil -m cp -n \
+    gsutil ${GSUTIL_OPTS} cp -n \
         "${local_mirror}/distfiles/*" "${remote_mirror}/distfiles"
 
     info "Uploading private metadata for $repo_name"
-    gsutil cp -a project-private \
+    gsutil ${GSUTIL_OPTS} cp -a project-private \
         "${local_mirror}/info/*" "${remote_mirror}/info"
 }
 download_mirror() {
@@ -74,11 +81,11 @@ download_mirror() {
 
     info "Downloading public distfiles for $repo_name"
     mkdir -p "${local_mirror}/"{distfiles,info}
-    gsutil -m cp -n \
+    gsutil ${GSUTIL_OPTS} cp -n \
         "${remote_mirror}/distfiles/*" "${local_mirror}/distfiles"
 
     info "Downloading private metadata for $repo_name"
-    gsutil cp "${remote_mirror}/info/*" "${local_mirror}/info"
+    gsutil ${GSUTIL_OPTS} cp "${remote_mirror}/info/*" "${local_mirror}/info"
 }
 
 if [[ ${FLAGS_download} -eq ${FLAGS_TRUE} ]]; then