diff options
author | Yash Tibrewal <yashkt@google.com> | 2017-10-05 09:45:44 -0700 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2017-10-05 09:45:44 -0700 |
commit | 70d3424005f30ff651768b2a86a1fa6f1158eb67 (patch) | |
tree | 39d7303f599411ab00e780a26477d34be72b6ace /tools | |
parent | 12587d5df5f6ce4a6601ae515ab097a05c989906 (diff) | |
parent | d6b7a28e36a84e67a64a7ddd6d4ebba0f783f912 (diff) |
Merge branch 'master' into externC
Diffstat (limited to 'tools')
-rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_rc | 8 | ||||
-rwxr-xr-x | tools/internal_ci/linux/grpc_microbenchmark_diff.sh | 2 | ||||
-rwxr-xr-x | tools/profiling/bloat/bloat_diff.py | 99 | ||||
-rw-r--r-- | tools/run_tests/generated/tests.json | 280 | ||||
-rwxr-xr-x | tools/run_tests/python_utils/jobset.py | 9 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 9 | ||||
-rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 1 |
7 files changed, 265 insertions, 143 deletions
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 5a5898f94c..dd98a12c65 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -27,6 +27,14 @@ ulimit -n 10000 # show current limits ulimit -a +# synchronize the clock +date +sudo systemsetup -setusingnetworktime off +sudo systemsetup -setnetworktimeserver "$( ipconfig getoption en0 server_identifier )" +sudo systemsetup -settimezone America/Los_Angeles +sudo systemsetup -setusingnetworktime on +date + # Add GCP credentials for BQ access pip install google-api-python-client --user python export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json diff --git a/tools/internal_ci/linux/grpc_microbenchmark_diff.sh b/tools/internal_ci/linux/grpc_microbenchmark_diff.sh index 58ffcf336b..45add1b02d 100755 --- a/tools/internal_ci/linux/grpc_microbenchmark_diff.sh +++ b/tools/internal_ci/linux/grpc_microbenchmark_diff.sh @@ -25,6 +25,8 @@ cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc tools/run_tests/start_port_server.py +tools/jenkins/run_c_cpp_test.sh tools/profiling/bloat/bloat_diff.py \ + -d origin/$ghprbTargetBranch || FAILED="true" tools/jenkins/run_c_cpp_test.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \ -d origin/$ghprbTargetBranch \ -b $BENCHMARKS_TO_RUN || FAILED="true" diff --git a/tools/profiling/bloat/bloat_diff.py b/tools/profiling/bloat/bloat_diff.py new file mode 100755 index 0000000000..9b40685e90 --- /dev/null +++ b/tools/profiling/bloat/bloat_diff.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python2.7 +# +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +import glob +import multiprocessing +import os +import shutil +import subprocess +import sys + +sys.path.append( + os.path.join( + os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) +import comment_on_pr + +argp = argparse.ArgumentParser( + description='Perform diff on microbenchmarks') + +argp.add_argument( + '-d', + '--diff_base', + type=str, + help='Commit or branch to compare the current one to') + +argp.add_argument( + '-j', + '--jobs', + type=int, + default=multiprocessing.cpu_count()) + +args = argp.parse_args() + +LIBS = [ + 'libgrpc.so', + 'libgrpc++.so', +] + +def build(where): + subprocess.check_call('make -j%d' % args.jobs, + shell=True, cwd='.') + shutil.rmtree('bloat_diff_%s' % where, ignore_errors=True) + os.rename('libs', 'bloat_diff_%s' % where) + +build('new') + +if args.diff_base: + old = 'old' + where_am_i = subprocess.check_output( + ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() + subprocess.check_call(['git', 'checkout', args.diff_base]) + subprocess.check_call(['git', 'submodule', 'update']) + try: + try: + build('old') + except subprocess.CalledProcessError, e: + subprocess.check_call(['make', 'clean']) + build('old') + finally: + subprocess.check_call(['git', 'checkout', where_am_i]) + subprocess.check_call(['git', 'submodule', 'update']) + +subprocess.check_call('make -j%d' % args.jobs, + shell=True, cwd='third_party/bloaty') + +text = '' +for lib in LIBS: + text += '****************************************************************\n\n' + text += lib + '\n\n' + old_version = glob.glob('bloat_diff_old/opt/%s' % lib) + new_version = glob.glob('bloat_diff_new/opt/%s' % lib) + assert len(new_version) == 1 + cmd = 'third_party/bloaty/bloaty -d compileunits,symbols' + if old_version: + assert len(old_version) == 1 + text += subprocess.check_output('%s %s -- %s' % + (cmd, new_version[0], old_version[0]), + shell=True) + else: + text += subprocess.check_output('%s %s' % + (cmd, new_version[0]), + shell=True) + text += '\n\n' + +print text +comment_on_pr.comment_on_pr('```\n%s\n```' % text) diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 72dfbc0b98..1fefb52f07 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -49542,7 +49542,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_1channel_100rpcs_1MB", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49567,7 +49567,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_1channel_1MB", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49592,7 +49592,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49617,7 +49617,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49642,7 +49642,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_1mps_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49667,7 +49667,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_10mps_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49692,7 +49692,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49717,7 +49717,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49742,7 +49742,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49767,7 +49767,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49792,7 +49792,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49817,7 +49817,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_one_server_core_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49844,7 +49844,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49869,7 +49869,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49896,7 +49896,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49921,7 +49921,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_secure_1MB", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49946,7 +49946,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49971,7 +49971,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -49996,7 +49996,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50021,7 +50021,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50046,7 +50046,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50071,7 +50071,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50096,7 +50096,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50121,7 +50121,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50146,7 +50146,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50171,7 +50171,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50196,7 +50196,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50221,7 +50221,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50246,7 +50246,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50271,7 +50271,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50296,7 +50296,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50321,7 +50321,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50346,7 +50346,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50371,7 +50371,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50396,7 +50396,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_ping_pong_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50421,7 +50421,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50446,7 +50446,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50471,7 +50471,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50496,7 +50496,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50521,7 +50521,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50546,7 +50546,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50571,7 +50571,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50596,7 +50596,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50621,7 +50621,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50646,7 +50646,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50671,7 +50671,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_one_server_core_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50698,7 +50698,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50723,7 +50723,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50750,7 +50750,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50775,7 +50775,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_insecure_1MB", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50800,7 +50800,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50825,7 +50825,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50850,7 +50850,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50875,7 +50875,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50900,7 +50900,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50925,7 +50925,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50950,7 +50950,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -50975,7 +50975,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51000,7 +51000,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51025,7 +51025,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51050,7 +51050,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51075,7 +51075,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51100,7 +51100,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51125,7 +51125,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51150,7 +51150,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51175,7 +51175,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51200,7 +51200,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51225,7 +51225,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51250,7 +51250,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_ping_pong_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51275,7 +51275,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51313,7 +51313,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_1channel_100rpcs_1MB_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51351,7 +51351,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_1channel_1MB_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51389,7 +51389,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51427,7 +51427,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51465,7 +51465,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_1mps_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51503,7 +51503,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_10mps_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51541,7 +51541,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_1channel_1MBmsg_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51579,7 +51579,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51617,7 +51617,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51655,7 +51655,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51693,7 +51693,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51731,7 +51731,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_one_server_core_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51771,7 +51771,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51809,7 +51809,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51849,7 +51849,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51887,7 +51887,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_secure_1MB_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51925,7 +51925,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -51963,7 +51963,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52001,7 +52001,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52039,7 +52039,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52077,7 +52077,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52115,7 +52115,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52153,7 +52153,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52191,7 +52191,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52229,7 +52229,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52267,7 +52267,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52305,7 +52305,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52343,7 +52343,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52381,7 +52381,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52419,7 +52419,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52457,7 +52457,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52495,7 +52495,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52533,7 +52533,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52571,7 +52571,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52609,7 +52609,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_ping_pong_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52647,7 +52647,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52685,7 +52685,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52723,7 +52723,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52761,7 +52761,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_1mps_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52799,7 +52799,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_10mps_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52837,7 +52837,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52875,7 +52875,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52913,7 +52913,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52951,7 +52951,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -52989,7 +52989,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53027,7 +53027,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_generic_async_streaming_qps_one_server_core_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53067,7 +53067,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53105,7 +53105,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53145,7 +53145,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53183,7 +53183,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_insecure_1MB_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53221,7 +53221,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53259,7 +53259,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_unary_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53297,7 +53297,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53335,7 +53335,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53373,7 +53373,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53411,7 +53411,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53449,7 +53449,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53487,7 +53487,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53525,7 +53525,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53563,7 +53563,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53601,7 +53601,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53639,7 +53639,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53677,7 +53677,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53715,7 +53715,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53753,7 +53753,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53791,7 +53791,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53829,7 +53829,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53867,7 +53867,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53905,7 +53905,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_ping_pong_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ @@ -53943,7 +53943,7 @@ "linux" ], "shortname": "json_run_localhost:cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure_low_thread_count", - "timeout_seconds": 360 + "timeout_seconds": 120 }, { "args": [ diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index 062c79a0de..82a3bc1435 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -364,7 +364,7 @@ class Job(object): class Jobset(object): """Manages one run of jobs.""" - def __init__(self, check_cancelled, maxjobs, newline_on_success, travis, + def __init__(self, check_cancelled, maxjobs, maxjobs_cpu_agnostic, newline_on_success, travis, stop_on_failure, add_env, quiet_success, max_time): self._running = set() self._check_cancelled = check_cancelled @@ -372,6 +372,7 @@ class Jobset(object): self._failures = 0 self._completed = 0 self._maxjobs = maxjobs + self._maxjobs_cpu_agnostic = maxjobs_cpu_agnostic self._newline_on_success = newline_on_success self._travis = travis self._stop_on_failure = stop_on_failure @@ -406,7 +407,9 @@ class Jobset(object): if self.cancelled(): return False current_cpu_cost = self.cpu_cost() if current_cpu_cost == 0: break - if current_cpu_cost + spec.cpu_cost <= self._maxjobs: break + if current_cpu_cost + spec.cpu_cost <= self._maxjobs: + if len(self._running) < self._maxjobs_cpu_agnostic: + break self.reap() if self.cancelled(): return False job = Job(spec, @@ -491,6 +494,7 @@ def tag_remaining(xs): def run(cmdlines, check_cancelled=_never_cancelled, maxjobs=None, + maxjobs_cpu_agnostic=None, newline_on_success=False, travis=False, infinite_runs=False, @@ -509,6 +513,7 @@ def run(cmdlines, return 0, resultset js = Jobset(check_cancelled, maxjobs if maxjobs is not None else _DEFAULT_MAX_JOBS, + maxjobs_cpu_agnostic if maxjobs_cpu_agnostic is not None else _DEFAULT_MAX_JOBS, newline_on_success, travis, stop_on_failure, add_env, quiet_success, max_time) for cmdline, remaining in tag_remaining(cmdlines): diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 803f2decbc..1c41679827 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -117,6 +117,13 @@ def run_shell_command(cmd, env=None, cwd=None): e.cmd, e.returncode, e.output) raise +def max_parallel_tests_for_current_platform(): + # Too much test parallelization has only been seen to be a problem + # so far on windows. + if jobset.platform_string() == 'windows': + return 64 + return 128 + # SimpleConfig: just compile with CONFIG=config, and run the binary to test class Config(object): @@ -1618,7 +1625,7 @@ def _build_and_run( jobset.message('START', 'Running tests quietly, only failing tests will be reported', do_newline=True) num_test_failures, resultset = jobset.run( all_runs, check_cancelled, newline_on_success=newline_on_success, - travis=args.travis, maxjobs=args.jobs, + travis=args.travis, maxjobs=args.jobs, maxjobs_cpu_agnostic=max_parallel_tests_for_current_platform(), stop_on_failure=args.stop_on_failure, quiet_success=args.quiet_success, max_time=args.max_time) if resultset: diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 7c934b1ba7..97324f0a3a 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -34,6 +34,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules 80a37e0782d2d702d52234b62dd4b9ec74fd2c95 third_party/protobuf (v3.4.0) cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11) 3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0) + 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty EOF diff -u $submodules $want_submodules |