Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16957 from jtattermusch/perf_benchmarks_polish

Browse Source 
End-to-end peformance benchmark improvements
pull/16727/head
Jan Tattermusch 6 years ago committed by GitHub
parent 62bdfadb73 185d7332ad
commit d0cc6bf255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      tools/run_tests/performance/scenario_config.py
  2. 13
      tools/run_tests/run_performance_tests.py

50
tools/run_tests/performance/scenario_config.py
Unescape View File

@ -250,7 +250,7 @@ class CXXLanguage:
channels=1, channels=1,
num_clients=1, num_clients=1,
secure=False, secure=False,
categories=[SMOKETEST] + [INPROC] + [SCALABLE]) categories=[INPROC] + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_async_streaming_from_client_1channel_1MB', 'cpp_protobuf_async_streaming_from_client_1channel_1MB',
@ -280,12 +280,12 @@ class CXXLanguage:
secure=False, secure=False,
async_server_threads=16, async_server_threads=16,
server_threads_per_cq=1, server_threads_per_cq=1,
categories=[SMOKETEST] + [SCALABLE]) categories=[SCALABLE])
for secure in [True, False]: for secure in [True, False]:
secstr = 'secure' if secure else 'insecure' secstr = 'secure' if secure else 'insecure'
smoketest_categories = ([SMOKETEST] smoketest_categories = ([SMOKETEST] if secure else [])
if secure else [INPROC]) + [SCALABLE] inproc_categories = ([INPROC] if not secure else [])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_generic_async_streaming_ping_pong_%s' % secstr, 'cpp_generic_async_streaming_ping_pong_%s' % secstr,
@ -295,7 +295,8 @@ class CXXLanguage:
use_generic_payload=True, use_generic_payload=True,
async_server_threads=1, async_server_threads=1,
secure=secure, secure=secure,
categories=smoketest_categories) categories=smoketest_categories + inproc_categories +
[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_generic_async_streaming_qps_unconstrained_%s' % secstr, 'cpp_generic_async_streaming_qps_unconstrained_%s' % secstr,
@ -306,7 +307,8 @@ class CXXLanguage:
use_generic_payload=True, use_generic_payload=True,
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories + inproc_categories +
[SCALABLE])
for mps in geometric_progression(1, 20, 10): for mps in geometric_progression(1, 20, 10):
yield _ping_pong_scenario( yield _ping_pong_scenario(
@ -320,7 +322,8 @@ class CXXLanguage:
secure=secure, secure=secure,
messages_per_stream=mps, messages_per_stream=mps,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories + inproc_categories +
[SCALABLE])
for mps in geometric_progression(1, 200, math.sqrt(10)): for mps in geometric_progression(1, 200, math.sqrt(10)):
yield _ping_pong_scenario( yield _ping_pong_scenario(
@ -347,7 +350,7 @@ class CXXLanguage:
use_generic_payload=True, use_generic_payload=True,
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE], categories=inproc_categories + [SCALABLE],
channels=1, channels=1,
outstanding=100) outstanding=100)
@ -363,7 +366,7 @@ class CXXLanguage:
use_generic_payload=True, use_generic_payload=True,
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_generic_async_streaming_qps_unconstrained_1cq_%s' % secstr, 'cpp_generic_async_streaming_qps_unconstrained_1cq_%s' % secstr,
@ -375,7 +378,8 @@ class CXXLanguage:
secure=secure, secure=secure,
client_threads_per_cq=1000000, client_threads_per_cq=1000000,
server_threads_per_cq=1000000, server_threads_per_cq=1000000,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories + inproc_categories +
[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_%s' 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_%s'
@ -388,7 +392,7 @@ class CXXLanguage:
secure=secure, secure=secure,
client_threads_per_cq=2, client_threads_per_cq=2,
server_threads_per_cq=2, server_threads_per_cq=2,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_async_streaming_qps_unconstrained_1cq_%s' % 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_%s' %
@ -400,7 +404,7 @@ class CXXLanguage:
secure=secure, secure=secure,
client_threads_per_cq=1000000, client_threads_per_cq=1000000,
server_threads_per_cq=1000000, server_threads_per_cq=1000000,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_%s' 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_%s'
@ -412,7 +416,7 @@ class CXXLanguage:
secure=secure, secure=secure,
client_threads_per_cq=2, client_threads_per_cq=2,
server_threads_per_cq=2, server_threads_per_cq=2,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_async_unary_qps_unconstrained_1cq_%s' % secstr, 'cpp_protobuf_async_unary_qps_unconstrained_1cq_%s' % secstr,
@ -423,7 +427,8 @@ class CXXLanguage:
secure=secure, secure=secure,
client_threads_per_cq=1000000, client_threads_per_cq=1000000,
server_threads_per_cq=1000000, server_threads_per_cq=1000000,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories + inproc_categories +
[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_%s' % 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_%s' %
@ -435,7 +440,7 @@ class CXXLanguage:
secure=secure, secure=secure,
client_threads_per_cq=2, client_threads_per_cq=2,
server_threads_per_cq=2, server_threads_per_cq=2,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_generic_async_streaming_qps_one_server_core_%s' % secstr, 'cpp_generic_async_streaming_qps_one_server_core_%s' % secstr,
@ -457,7 +462,8 @@ class CXXLanguage:
unconstrained_client='async', unconstrained_client='async',
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE], categories=smoketest_categories + inproc_categories +
[SCALABLE],
excluded_poll_engines=['poll-cv']) excluded_poll_engines=['poll-cv'])
yield _ping_pong_scenario( yield _ping_pong_scenario(
@ -472,7 +478,7 @@ class CXXLanguage:
resp_size=8 * 1024 * 1024, resp_size=8 * 1024 * 1024,
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_%s' 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_%s'
@ -483,7 +489,8 @@ class CXXLanguage:
unconstrained_client='async', unconstrained_client='async',
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE], categories=smoketest_categories + inproc_categories +
[SCALABLE],
excluded_poll_engines=['poll-cv']) excluded_poll_engines=['poll-cv'])
yield _ping_pong_scenario( yield _ping_pong_scenario(
@ -495,7 +502,8 @@ class CXXLanguage:
resp_size=1024 * 1024, resp_size=1024 * 1024,
secure=secure, secure=secure,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories + inproc_categories +
[SCALABLE])
for rpc_type in [ for rpc_type in [
'unary', 'streaming', 'streaming_from_client', 'unary', 'streaming', 'streaming_from_client',
@ -538,7 +546,7 @@ class CXXLanguage:
minimal_stack=not secure, minimal_stack=not secure,
server_threads_per_cq=3, server_threads_per_cq=3,
client_threads_per_cq=3, client_threads_per_cq=3,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
# TODO(vjpai): Re-enable this test. It has a lot of timeouts # TODO(vjpai): Re-enable this test. It has a lot of timeouts
# and hasn't yet been conclusively identified as a test failure # and hasn't yet been conclusively identified as a test failure
@ -565,7 +573,7 @@ class CXXLanguage:
secure=secure, secure=secure,
messages_per_stream=mps, messages_per_stream=mps,
minimal_stack=not secure, minimal_stack=not secure,
categories=smoketest_categories + [SCALABLE]) categories=inproc_categories + [SCALABLE])
for mps in geometric_progression(1, 200, math.sqrt(10)): for mps in geometric_progression(1, 200, math.sqrt(10)):
yield _ping_pong_scenario( yield _ping_pong_scenario(

13
tools/run_tests/run_performance_tests.py
Unescape View File

@ -41,6 +41,11 @@ os.chdir(_ROOT)
_REMOTE_HOST_USERNAME = 'jenkins' _REMOTE_HOST_USERNAME = 'jenkins'
_SCENARIO_TIMEOUT = 3 * 60
_WORKER_TIMEOUT = 3 * 60
_NETPERF_TIMEOUT = 60
_QUIT_WORKER_TIMEOUT = 2 * 60
class QpsWorkerJob: class QpsWorkerJob:
"""Encapsulates a qps worker server job.""" """Encapsulates a qps worker server job."""
@ -85,7 +90,7 @@ def create_qpsworker_job(language,
cmdline = perf_cmd + ['-o', '%s-perf.data' % perf_file_base_name cmdline = perf_cmd + ['-o', '%s-perf.data' % perf_file_base_name
] + cmdline ] + cmdline
worker_timeout = 3 * 60 worker_timeout = _WORKER_TIMEOUT
if remote_host: if remote_host:
user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host)
ssh_cmd = ['ssh'] ssh_cmd = ['ssh']
@ -131,7 +136,7 @@ def create_scenario_jobspec(scenario_json,
return jobset.JobSpec( return jobset.JobSpec(
cmdline=[cmd], cmdline=[cmd],
shortname='qps_json_driver.%s' % scenario_json['name'], shortname='qps_json_driver.%s' % scenario_json['name'],
timeout_seconds=12 * 60, timeout_seconds=_SCENARIO_TIMEOUT,
shell=True, shell=True,
verbose_success=True) verbose_success=True)
@ -149,7 +154,7 @@ def create_quit_jobspec(workers, remote_host=None):
return jobset.JobSpec( return jobset.JobSpec(
cmdline=[cmd], cmdline=[cmd],
shortname='qps_json_driver.quit', shortname='qps_json_driver.quit',
timeout_seconds=3 * 60, timeout_seconds=_QUIT_WORKER_TIMEOUT,
shell=True, shell=True,
verbose_success=True) verbose_success=True)
@ -181,7 +186,7 @@ def create_netperf_jobspec(server_host='localhost',
return jobset.JobSpec( return jobset.JobSpec(
cmdline=[cmd], cmdline=[cmd],
shortname='netperf', shortname='netperf',
timeout_seconds=60, timeout_seconds=_NETPERF_TIMEOUT,
shell=True, shell=True,
verbose_success=True) verbose_success=True)

Write Preview
Loading…
Cancel
Save