diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-10-18 13:04:48 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-10-18 13:04:48 -0700 |
| commit | 697b167ff35a7d09cc96b3bd99744ef23ab0fd0c (patch) | |
| tree | 1dab702ef4535336cee29fd7dfa8ff35a06a3476 /tools | |
| parent | b53e5d1f2b3a20299a2b65afffed6958a77ebfb6 (diff) | |
| parent | 4a8cf1dc66ad7a15ed79c8b9907e1541c0aab229 (diff) | |
Merge branch 'master' into node_express_benchmark
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/codegen/core/gen_static_metadata.py | 4 | ||||
| -rwxr-xr-x | tools/gce/linux_performance_worker_init.sh | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 6f400102e4..6f8cad279c 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -109,8 +109,8 @@ CONFIG = [ ('if-range', ''), ('if-unmodified-since', ''), ('last-modified', ''), - ('load-reporting-initial', ''), - ('load-reporting-trailing', ''), + ('lb-token', ''), + ('lb-cost', ''), ('link', ''), ('location', ''), ('max-forwards', ''), diff --git a/tools/gce/linux_performance_worker_init.sh b/tools/gce/linux_performance_worker_init.sh index ea80d74bdf..487672549f 100755 --- a/tools/gce/linux_performance_worker_init.sh +++ b/tools/gce/linux_performance_worker_init.sh @@ -128,4 +128,15 @@ gem install bundler # Java dependencies - nothing as we already have Java JDK 8 # Go dependencies -sudo apt-get install -y golang-go +# Currently, the golang package available via apt-get doesn't have the latest go. +# Significant performance improvements with grpc-go have been observed after +# upgrading from go 1.5 to a later version, so a later go version is preferred. +# Following go install instructions from https://golang.org/doc/install +GO_VERSION=1.7.1 +OS=linux +ARCH=amd64 +curl -O https://storage.googleapis.com/golang/go${GO_VERSION}.${OS}-${ARCH}.tar.gz +sudo tar -C /usr/local -xzf go$GO_VERSION.$OS-$ARCH.tar.gz +# Put go on the PATH, keep the usual installation dir +sudo ln -s /usr/local/go/bin/go /usr/bin/go +rm go$GO_VERSION.$OS-$ARCH.tar.gz |