Merge branch 'master' into topo

.travis.yml

@@ -1,3 +1,4 @@
+# TODO(mberlin): Remove all "free" and "ps" commands once https://github.com/travis-ci/travis-ci/issues/4013 is resolved.
 language: go
 go:
   - 1.4
@@ -13,10 +14,38 @@ env:
     - MAKE_TARGET=queryservice_test
     - MAKE_TARGET=unit_test
 before_install:
+  - |
+      free -m | grep "buffers/cache" | awk '{ if ($3 > 900) { print "\n\nCAUTION - CAUTION - CAUTION\n\nFLAKING TEST LIKELY BECAUSE MEMORY USAGE IS TOO HIGH ("$3" MB).\n\n" } else { print "\n\nINFO - LOOKS LIKE NO MEMORY IS LEAKING, TEST RESULTS WILL NOT BE FLAKY\n\n" } }'
+  - free -m
+  - ps -A -o pid,rss,vsz,cmd --sort -rss
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $2 } END { print sum / 1024.0, "MB used" }'
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $3 } END { print sum / 1024.0, "MB virtual memory used" }'
   - bash -v travis/dependencies.sh
+  - free -m
+  - ps -A -o pid,rss,vsz,cmd --sort -rss
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $2 } END { print sum / 1024.0, "MB used" }'
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $3 } END { print sum / 1024.0, "MB virtual memory used" }'
   - sudo bash -v travis/install_grpc.sh
+  - free -m
+  - ps -A -o pid,rss,vsz,cmd --sort -rss
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $2 } END { print sum / 1024.0, "MB used" }'
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $3 } END { print sum / 1024.0, "MB virtual memory used" }'
 install:
   - bash -v bootstrap.sh --skip_root_installs
+  - free -m
+  - ps -A -o pid,rss,vsz,cmd --sort -rss
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $2 } END { print sum / 1024.0, "MB used" }'
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $3 } END { print sum / 1024.0, "MB virtual memory used" }'
 script:
   - source dev.env
-  - travis_retry make build $MAKE_TARGET
+  - free -m
+  - ps -A -o pid,rss,vsz,cmd --sort -rss
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $2 } END { print sum / 1024.0, "MB used" }'
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $3 } END { print sum / 1024.0, "MB virtual memory used" }'
+# TODO(mberlin): Readd "travis_retry" before "make" when https://github.com/travis-ci/travis-ci/issues/4013 is resolved.
+  - |
+      /usr/bin/time -f "CPU: %P Memory: %M kB" make build $MAKE_TARGET
+  - free -m
+  - ps -A -o pid,rss,vsz,cmd --sort -rss
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $2 } END { print sum / 1024.0, "MB used" }'
+  - ps -A -o pid,rss,vsz,cmd --sort -rss | awk '{ sum += $3 } END { print sum / 1024.0, "MB virtual memory used" }'