remove formatting noise

pull/8215/head
Sree Kuchibhotla 9 years ago
parent 34ad82d6f6
commit bba2f47e8f
  1. 443
      tools/run_tests/performance/scenario_config.py

@ -31,49 +31,52 @@
import math import math
WARMUP_SECONDS = 5 WARMUP_SECONDS=5
JAVA_WARMUP_SECONDS = 15 # Java needs more warmup time for JIT to kick in. JAVA_WARMUP_SECONDS=15 # Java needs more warmup time for JIT to kick in.
BENCHMARK_SECONDS = 30 BENCHMARK_SECONDS=30
SMOKETEST = 'smoketest' SMOKETEST='smoketest'
SCALABLE = 'scalable' SCALABLE='scalable'
SWEEP = 'sweep' SWEEP='sweep'
DEFAULT_CATEGORIES = [SCALABLE, SMOKETEST] DEFAULT_CATEGORIES=[SCALABLE, SMOKETEST]
SECURE_SECARGS = {'use_test_ca': True, SECURE_SECARGS = {'use_test_ca': True,
'server_host_override': 'foo.test.google.fr'} 'server_host_override': 'foo.test.google.fr'}
HISTOGRAM_PARAMS = { HISTOGRAM_PARAMS = {
'resolution': 0.01, 'resolution': 0.01,
'max_possible': 60e9, 'max_possible': 60e9,
} }
EMPTY_GENERIC_PAYLOAD = { EMPTY_GENERIC_PAYLOAD = {
'bytebuf_params': { 'bytebuf_params': {
'req_size': 0, 'req_size': 0,
'resp_size': 0, 'resp_size': 0,
} }
} }
EMPTY_PROTO_PAYLOAD = { EMPTY_PROTO_PAYLOAD = {
'simple_params': { 'simple_params': {
'req_size': 0, 'req_size': 0,
'resp_size': 0, 'resp_size': 0,
} }
} }
BIG_GENERIC_PAYLOAD = { BIG_GENERIC_PAYLOAD = {
'bytebuf_params': { 'bytebuf_params': {
'req_size': 65536, 'req_size': 65536,
'resp_size': 65536, 'resp_size': 65536,
} }
} }
# target number of RPCs outstanding on across all client channels in # target number of RPCs outstanding on across all client channels in
# non-ping-pong tests (since we can only specify per-channel numbers, the # non-ping-pong tests (since we can only specify per-channel numbers, the
# actual target will be slightly higher) # actual target will be slightly higher)
OUTSTANDING_REQUESTS = {'async': 6400, 'sync': 1000} OUTSTANDING_REQUESTS={
'async': 6400,
'sync': 1000
}
# wide is the number of client channels in multi-channel tests (1 otherwise) # wide is the number of client channels in multi-channel tests (1 otherwise)
WIDE = 64 WIDE=64
def _get_secargs(is_secure): def _get_secargs(is_secure):
@ -99,10 +102,8 @@ def geometric_progression(start, stop, step):
n *= step n *= step
def _ping_pong_scenario(name, def _ping_pong_scenario(name, rpc_type,
rpc_type, client_type, server_type,
client_type,
server_type,
secure=True, secure=True,
use_generic_payload=False, use_generic_payload=False,
unconstrained_client=None, unconstrained_client=None,
@ -116,29 +117,29 @@ def _ping_pong_scenario(name,
outstanding=None): outstanding=None):
"""Creates a basic ping pong scenario.""" """Creates a basic ping pong scenario."""
scenario = { scenario = {
'name': name, 'name': name,
'num_servers': 1, 'num_servers': 1,
'num_clients': 1, 'num_clients': 1,
'client_config': { 'client_config': {
'client_type': client_type, 'client_type': client_type,
'security_params': _get_secargs(secure), 'security_params': _get_secargs(secure),
'outstanding_rpcs_per_channel': 1, 'outstanding_rpcs_per_channel': 1,
'client_channels': 1, 'client_channels': 1,
'async_client_threads': 1, 'async_client_threads': 1,
'rpc_type': rpc_type, 'rpc_type': rpc_type,
'load_params': { 'load_params': {
'closed_loop': {} 'closed_loop': {}
},
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': server_type,
'security_params': _get_secargs(secure),
'core_limit': server_core_limit,
'async_server_threads': async_server_threads,
}, },
'warmup_seconds': warmup_seconds, 'histogram_params': HISTOGRAM_PARAMS,
'benchmark_seconds': BENCHMARK_SECONDS },
'server_config': {
'server_type': server_type,
'security_params': _get_secargs(secure),
'core_limit': server_core_limit,
'async_server_threads': async_server_threads,
},
'warmup_seconds': warmup_seconds,
'benchmark_seconds': BENCHMARK_SECONDS
} }
if use_generic_payload: if use_generic_payload:
if server_type != 'ASYNC_GENERIC_SERVER': if server_type != 'ASYNC_GENERIC_SERVER':
@ -150,8 +151,7 @@ def _ping_pong_scenario(name,
scenario['client_config']['payload_config'] = EMPTY_PROTO_PAYLOAD scenario['client_config']['payload_config'] = EMPTY_PROTO_PAYLOAD
if unconstrained_client: if unconstrained_client:
outstanding_calls = outstanding if outstanding is not None else OUTSTANDING_REQUESTS[ outstanding_calls = outstanding if outstanding is not None else OUTSTANDING_REQUESTS[unconstrained_client]
unconstrained_client]
wide = channels if channels is not None else WIDE wide = channels if channels is not None else WIDE
deep = int(math.ceil(1.0 * outstanding_calls / wide)) deep = int(math.ceil(1.0 * outstanding_calls / wide))
@ -197,9 +197,7 @@ class CXXLanguage:
rpc_type='STREAMING', rpc_type='STREAMING',
client_type='ASYNC_CLIENT', client_type='ASYNC_CLIENT',
server_type='ASYNC_GENERIC_SERVER', server_type='ASYNC_GENERIC_SERVER',
use_generic_payload=True, use_generic_payload=True, server_core_limit=1, async_server_threads=1,
server_core_limit=1,
async_server_threads=1,
secure=secure, secure=secure,
categories=smoketest_categories) categories=smoketest_categories)
@ -208,20 +206,17 @@ class CXXLanguage:
rpc_type='STREAMING', rpc_type='STREAMING',
client_type='ASYNC_CLIENT', client_type='ASYNC_CLIENT',
server_type='ASYNC_GENERIC_SERVER', server_type='ASYNC_GENERIC_SERVER',
unconstrained_client='async', unconstrained_client='async', use_generic_payload=True,
use_generic_payload=True,
secure=secure, secure=secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_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,
rpc_type='STREAMING', rpc_type='STREAMING',
client_type='ASYNC_CLIENT', client_type='ASYNC_CLIENT',
server_type='ASYNC_GENERIC_SERVER', server_type='ASYNC_GENERIC_SERVER',
unconstrained_client='async', unconstrained_client='async', use_generic_payload=True,
use_generic_payload=True, server_core_limit=1, async_server_threads=1,
server_core_limit=1,
async_server_threads=1,
secure=secure) secure=secure)
yield _ping_pong_scenario( yield _ping_pong_scenario(
@ -237,42 +232,33 @@ class CXXLanguage:
for rpc_type in ['unary', 'streaming']: for rpc_type in ['unary', 'streaming']:
for synchronicity in ['sync', 'async']: for synchronicity in ['sync', 'async']:
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_%s_%s_ping_pong_%s' % 'cpp_protobuf_%s_%s_ping_pong_%s' % (synchronicity, rpc_type, secstr),
(synchronicity, rpc_type, secstr),
rpc_type=rpc_type.upper(), rpc_type=rpc_type.upper(),
client_type='%s_CLIENT' % synchronicity.upper(), client_type='%s_CLIENT' % synchronicity.upper(),
server_type='%s_SERVER' % synchronicity.upper(), server_type='%s_SERVER' % synchronicity.upper(),
server_core_limit=1, server_core_limit=1, async_server_threads=1,
async_server_threads=1,
secure=secure) secure=secure)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_%s_%s_qps_unconstrained_%s' % 'cpp_protobuf_%s_%s_qps_unconstrained_%s' % (synchronicity, rpc_type, secstr),
(synchronicity, rpc_type, secstr),
rpc_type=rpc_type.upper(), rpc_type=rpc_type.upper(),
client_type='%s_CLIENT' % synchronicity.upper(), client_type='%s_CLIENT' % synchronicity.upper(),
server_type='%s_SERVER' % synchronicity.upper(), server_type='%s_SERVER' % synchronicity.upper(),
unconstrained_client=synchronicity, unconstrained_client=synchronicity,
secure=secure, secure=secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories+[SCALABLE])
for channels in geometric_progression(1, 20000, math.sqrt(10)): for channels in geometric_progression(1, 20000, math.sqrt(10)):
for outstanding in geometric_progression(1, 200000, math.sqrt(10)): for outstanding in geometric_progression(1, 200000, math.sqrt(10)):
if synchronicity == 'sync' and outstanding > 1200: if synchronicity == 'sync' and outstanding > 1200: continue
continue if outstanding < channels: continue
if outstanding < channels: yield _ping_pong_scenario(
continue 'cpp_protobuf_%s_%s_qps_unconstrained_%s_%d_channels_%d_outstanding' % (synchronicity, rpc_type, secstr, channels, outstanding),
yield _ping_pong_scenario( rpc_type=rpc_type.upper(),
'cpp_protobuf_%s_%s_qps_unconstrained_%s_%d_channels_%d_outstanding' client_type='%s_CLIENT' % synchronicity.upper(),
% (synchronicity, rpc_type, secstr, channels, outstanding), server_type='%s_SERVER' % synchronicity.upper(),
rpc_type=rpc_type.upper(), unconstrained_client=synchronicity, secure=secure,
client_type='%s_CLIENT' % synchronicity.upper(), categories=[SWEEP], channels=channels, outstanding=outstanding)
server_type='%s_SERVER' % synchronicity.upper(),
unconstrained_client=synchronicity,
secure=secure,
categories=[SWEEP],
channels=channels,
outstanding=outstanding)
def __str__(self): def __str__(self):
return 'c++' return 'c++'
@ -291,18 +277,14 @@ class CSharpLanguage:
def scenarios(self): def scenarios(self):
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_generic_async_streaming_ping_pong', 'csharp_generic_async_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_GENERIC_SERVER',
use_generic_payload=True, use_generic_payload=True,
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_protobuf_async_streaming_ping_pong', 'csharp_protobuf_async_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER')
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_protobuf_async_unary_ping_pong', rpc_type='UNARY', 'csharp_protobuf_async_unary_ping_pong', rpc_type='UNARY',
@ -310,24 +292,18 @@ class CSharpLanguage:
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_protobuf_sync_to_async_unary_ping_pong', 'csharp_protobuf_sync_to_async_unary_ping_pong', rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER')
client_type='SYNC_CLIENT',
server_type='ASYNC_SERVER')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_protobuf_async_unary_qps_unconstrained', 'csharp_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST,SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_protobuf_async_streaming_qps_unconstrained', 'csharp_protobuf_async_streaming_qps_unconstrained', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
categories=[SCALABLE]) categories=[SCALABLE])
@ -338,41 +314,29 @@ class CSharpLanguage:
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_to_cpp_protobuf_async_streaming_ping_pong', 'csharp_to_cpp_protobuf_async_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT', server_language='c++', server_core_limit=1, async_server_threads=1)
server_type='ASYNC_SERVER',
server_language='c++',
server_core_limit=1,
async_server_threads=1)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_to_cpp_protobuf_async_unary_qps_unconstrained', 'csharp_to_cpp_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT', unconstrained_client='async', server_language='c++',
server_type='ASYNC_SERVER',
unconstrained_client='async',
server_language='c++',
categories=[SCALABLE]) categories=[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'csharp_to_cpp_protobuf_sync_to_async_unary_qps_unconstrained', 'csharp_to_cpp_protobuf_sync_to_async_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='SYNC_CLIENT', unconstrained_client='sync', server_language='c++',
server_type='ASYNC_SERVER',
unconstrained_client='sync',
server_language='c++',
categories=[SCALABLE]) categories=[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_to_csharp_protobuf_async_unary_qps_unconstrained', 'cpp_to_csharp_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT', unconstrained_client='async', client_language='c++',
server_type='ASYNC_SERVER',
unconstrained_client='async',
client_language='c++',
categories=[SCALABLE]) categories=[SCALABLE])
def __str__(self): def __str__(self):
return 'csharp' return 'csharp'
@ -407,10 +371,8 @@ class NodeLanguage:
categories=[SCALABLE, SMOKETEST]) categories=[SCALABLE, SMOKETEST])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'node_protobuf_async_unary_qps_unconstrained', 'node_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
categories=[SCALABLE, SMOKETEST]) categories=[SCALABLE, SMOKETEST])
@ -435,7 +397,6 @@ class NodeLanguage:
def __str__(self): def __str__(self):
return 'node' return 'node'
class PythonLanguage: class PythonLanguage:
def __init__(self): def __init__(self):
@ -449,24 +410,18 @@ class PythonLanguage:
def scenarios(self): def scenarios(self):
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_generic_sync_streaming_ping_pong', 'python_generic_sync_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='SYNC_CLIENT',
server_type='ASYNC_GENERIC_SERVER',
use_generic_payload=True, use_generic_payload=True,
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_protobuf_sync_streaming_ping_pong', 'python_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER')
client_type='SYNC_CLIENT',
server_type='ASYNC_SERVER')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_protobuf_async_unary_ping_pong', 'python_protobuf_async_unary_ping_pong', rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER')
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_protobuf_sync_unary_ping_pong', rpc_type='UNARY', 'python_protobuf_sync_unary_ping_pong', rpc_type='UNARY',
@ -474,17 +429,13 @@ class PythonLanguage:
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_protobuf_sync_unary_qps_unconstrained', 'python_protobuf_sync_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='sync') unconstrained_client='sync')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_protobuf_sync_streaming_qps_unconstrained', 'python_protobuf_sync_streaming_qps_unconstrained', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='sync') unconstrained_client='sync')
yield _ping_pong_scenario( yield _ping_pong_scenario(
@ -494,18 +445,13 @@ class PythonLanguage:
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'python_to_cpp_protobuf_sync_streaming_ping_pong', 'python_to_cpp_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='SYNC_CLIENT', server_language='c++', server_core_limit=1, async_server_threads=1)
server_type='ASYNC_SERVER',
server_language='c++',
server_core_limit=1,
async_server_threads=1)
def __str__(self): def __str__(self):
return 'python' return 'python'
class RubyLanguage: class RubyLanguage:
def __init__(self): def __init__(self):
@ -530,36 +476,24 @@ class RubyLanguage:
categories=[SMOKETEST, SCALABLE]) categories=[SMOKETEST, SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'ruby_protobuf_sync_unary_qps_unconstrained', 'ruby_protobuf_sync_unary_qps_unconstrained', rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
unconstrained_client='sync') unconstrained_client='sync')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'ruby_protobuf_sync_streaming_qps_unconstrained', 'ruby_protobuf_sync_streaming_qps_unconstrained', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
unconstrained_client='sync') unconstrained_client='sync')
yield _ping_pong_scenario( yield _ping_pong_scenario(
'ruby_to_cpp_protobuf_sync_unary_ping_pong', 'ruby_to_cpp_protobuf_sync_unary_ping_pong', rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT', server_language='c++', server_core_limit=1, async_server_threads=1)
server_type='SYNC_SERVER',
server_language='c++',
server_core_limit=1,
async_server_threads=1)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'ruby_to_cpp_protobuf_sync_streaming_ping_pong', 'ruby_to_cpp_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT', server_language='c++', server_core_limit=1, async_server_threads=1)
server_type='SYNC_SERVER',
server_language='c++',
server_core_limit=1,
async_server_threads=1)
def __str__(self): def __str__(self):
return 'ruby' return 'ruby'
@ -583,85 +517,58 @@ class JavaLanguage:
smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE] smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE]
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_generic_async_streaming_ping_pong_%s' % secstr, 'java_generic_async_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='ASYNC_CLIENT', use_generic_payload=True, async_server_threads=1,
server_type='ASYNC_GENERIC_SERVER', secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS,
use_generic_payload=True,
async_server_threads=1,
secure=secure,
warmup_seconds=JAVA_WARMUP_SECONDS,
categories=smoketest_categories) categories=smoketest_categories)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_protobuf_async_streaming_ping_pong_%s' % secstr, 'java_protobuf_async_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
async_server_threads=1, async_server_threads=1,
secure=secure, secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS)
warmup_seconds=JAVA_WARMUP_SECONDS)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_protobuf_async_unary_ping_pong_%s' % secstr, 'java_protobuf_async_unary_ping_pong_%s' % secstr, rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
async_server_threads=1, async_server_threads=1,
secure=secure, secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS,
warmup_seconds=JAVA_WARMUP_SECONDS,
categories=smoketest_categories) categories=smoketest_categories)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_protobuf_unary_ping_pong_%s' % secstr, 'java_protobuf_unary_ping_pong_%s' % secstr, rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
async_server_threads=1, async_server_threads=1,
secure=secure, secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS)
warmup_seconds=JAVA_WARMUP_SECONDS)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_protobuf_async_unary_qps_unconstrained_%s' % secstr, 'java_protobuf_async_unary_qps_unconstrained_%s' % secstr, rpc_type='UNARY',
rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
secure=secure, secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS,
warmup_seconds=JAVA_WARMUP_SECONDS, categories=smoketest_categories+[SCALABLE])
categories=smoketest_categories + [SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_protobuf_async_streaming_qps_unconstrained_%s' % secstr, 'java_protobuf_async_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER',
client_type='ASYNC_CLIENT',
server_type='ASYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
secure=secure, secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS,
warmup_seconds=JAVA_WARMUP_SECONDS,
categories=[SCALABLE]) categories=[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_generic_async_streaming_qps_unconstrained_%s' % secstr, 'java_generic_async_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='ASYNC_CLIENT', unconstrained_client='async', use_generic_payload=True,
server_type='ASYNC_GENERIC_SERVER', secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS,
unconstrained_client='async',
use_generic_payload=True,
secure=secure,
warmup_seconds=JAVA_WARMUP_SECONDS,
categories=[SCALABLE]) categories=[SCALABLE])
yield _ping_pong_scenario( yield _ping_pong_scenario(
'java_generic_async_streaming_qps_one_server_core_%s' % secstr, 'java_generic_async_streaming_qps_one_server_core_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='ASYNC_CLIENT', unconstrained_client='async', use_generic_payload=True,
server_type='ASYNC_GENERIC_SERVER',
unconstrained_client='async',
use_generic_payload=True,
async_server_threads=1, async_server_threads=1,
secure=secure, secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS)
warmup_seconds=JAVA_WARMUP_SECONDS)
# TODO(jtattermusch): add scenarios java vs C++ # TODO(jtattermusch): add scenarios java vs C++
@ -689,48 +596,37 @@ class GoLanguage:
# ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server, # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server,
# but that's mostly because of lack of better name of the enum value. # but that's mostly because of lack of better name of the enum value.
yield _ping_pong_scenario( yield _ping_pong_scenario(
'go_generic_sync_streaming_ping_pong_%s' % secstr, 'go_generic_sync_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='SYNC_CLIENT', use_generic_payload=True, async_server_threads=1,
server_type='ASYNC_GENERIC_SERVER',
use_generic_payload=True,
async_server_threads=1,
secure=secure, secure=secure,
categories=smoketest_categories) categories=smoketest_categories)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'go_protobuf_sync_streaming_ping_pong_%s' % secstr, 'go_protobuf_sync_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
async_server_threads=1, async_server_threads=1,
secure=secure) secure=secure)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'go_protobuf_sync_unary_ping_pong_%s' % secstr, 'go_protobuf_sync_unary_ping_pong_%s' % secstr, rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
async_server_threads=1, async_server_threads=1,
secure=secure, secure=secure,
categories=smoketest_categories) categories=smoketest_categories)
# unconstrained_client='async' is intended (client uses goroutines) # unconstrained_client='async' is intended (client uses goroutines)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'go_protobuf_sync_unary_qps_unconstrained_%s' % secstr, 'go_protobuf_sync_unary_qps_unconstrained_%s' % secstr, rpc_type='UNARY',
rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
secure=secure, secure=secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories+[SCALABLE])
# unconstrained_client='async' is intended (client uses goroutines) # unconstrained_client='async' is intended (client uses goroutines)
yield _ping_pong_scenario( yield _ping_pong_scenario(
'go_protobuf_sync_streaming_qps_unconstrained_%s' % secstr, 'go_protobuf_sync_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='SYNC_SERVER',
client_type='SYNC_CLIENT',
server_type='SYNC_SERVER',
unconstrained_client='async', unconstrained_client='async',
secure=secure, secure=secure,
categories=[SCALABLE]) categories=[SCALABLE])
@ -739,12 +635,9 @@ class GoLanguage:
# ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server, # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server,
# but that's mostly because of lack of better name of the enum value. # but that's mostly because of lack of better name of the enum value.
yield _ping_pong_scenario( yield _ping_pong_scenario(
'go_generic_sync_streaming_qps_unconstrained_%s' % secstr, 'go_generic_sync_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING',
rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER',
client_type='SYNC_CLIENT', unconstrained_client='async', use_generic_payload=True,
server_type='ASYNC_GENERIC_SERVER',
unconstrained_client='async',
use_generic_payload=True,
secure=secure, secure=secure,
categories=[SCALABLE]) categories=[SCALABLE])
@ -755,11 +648,11 @@ class GoLanguage:
LANGUAGES = { LANGUAGES = {
'c++': CXXLanguage(), 'c++' : CXXLanguage(),
'csharp': CSharpLanguage(), 'csharp' : CSharpLanguage(),
'node': NodeLanguage(), 'node' : NodeLanguage(),
'ruby': RubyLanguage(), 'ruby' : RubyLanguage(),
'java': JavaLanguage(), 'java' : JavaLanguage(),
'python': PythonLanguage(), 'python' : PythonLanguage(),
'go': GoLanguage(), 'go' : GoLanguage(),
} }

Loading…
Cancel
Save