diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-10-26 11:16:02 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-26 11:16:02 -0700 |
| commit | fd4dcd9178c8c36f613619b3bda8ba34d48777f5 (patch) | |
| tree | b5c246e4c5f39322d152cbf656344088f7683273 /tools/run_tests/performance | |
| parent | e50d87740d7c1751581a42cab219e5d76778fd03 (diff) | |
| parent | a2465b02f283425b6355707800100a7504a62ee2 (diff) | |
Merge branch 'master' into remove_node
Diffstat (limited to 'tools/run_tests/performance')
| -rw-r--r-- | tools/run_tests/performance/scenario_config.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py index e5fe0c542c..cafac3dfad 100644 --- a/tools/run_tests/performance/scenario_config.py +++ b/tools/run_tests/performance/scenario_config.py @@ -22,6 +22,7 @@ BENCHMARK_SECONDS=30 SMOKETEST='smoketest' SCALABLE='scalable' +INPROC='inproc' SWEEP='sweep' DEFAULT_CATEGORIES=[SCALABLE, SMOKETEST] @@ -236,7 +237,7 @@ class CXXLanguage: unconstrained_client='async', outstanding=100, channels=1, num_clients=1, secure=False, - categories=[SMOKETEST] + [SCALABLE]) + categories=[SMOKETEST] + [INPROC] + [SCALABLE]) yield _ping_pong_scenario( 'cpp_protobuf_async_streaming_from_client_1channel_1MB', rpc_type='STREAMING_FROM_CLIENT', @@ -245,7 +246,7 @@ class CXXLanguage: unconstrained_client='async', outstanding=1, channels=1, num_clients=1, secure=False, - categories=[SMOKETEST] + [SCALABLE]) + categories=[SMOKETEST] + [INPROC] + [SCALABLE]) yield _ping_pong_scenario( 'cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp', @@ -253,12 +254,12 @@ class CXXLanguage: req_size=300, resp_size=50, unconstrained_client='async', outstanding=30000, channels=300, offered_load=37500, secure=False, - async_server_threads=16, server_threads_per_cq=16, + async_server_threads=16, server_threads_per_cq=1, categories=[SMOKETEST] + [SCALABLE]) for secure in [True, False]: secstr = 'secure' if secure else 'insecure' - smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE] + smoketest_categories = ([SMOKETEST] if secure else [INPROC]) + [SCALABLE] yield _ping_pong_scenario( 'cpp_generic_async_streaming_ping_pong_%s' % secstr, |