Skip to content

Commit

Permalink
tiny fixes to scenario_config
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtattermusch
jtattermusch committed Apr 14, 2016
1 parent c578e44 commit 4fec48b
Showing 1 changed file with 28 additions and 15 deletions.
43 changes: 28 additions & 15 deletions tools/run_tests/performance/scenario_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
WARMUP_SECONDS=5
BENCHMARK_SECONDS=30

HISTOGRAM_PARAMS = {
'resolution': 0.01,
'max_possible': 60e9,
}

EMPTY_GENERIC_PAYLOAD = {
'bytebuf_params': {
'req_size': 0,
Expand Down Expand Up @@ -83,7 +88,7 @@ def scenarios(self):
secargs = None

yield {
'name': 'generic_async_streaming_ping_pong_%s'
'name': 'cpp_generic_async_streaming_ping_pong_%s'
% secstr,
'num_servers': 1,
'num_clients': 1,
Expand All @@ -98,6 +103,7 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': EMPTY_GENERIC_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
Expand All @@ -110,7 +116,7 @@ def scenarios(self):
'benchmark_seconds': BENCHMARK_SECONDS
}
yield {
'name': 'generic_async_streaming_qps_unconstrained_%s'
'name': 'cpp_generic_async_streaming_qps_unconstrained_%s'
% secstr,
'num_servers': 1,
'num_clients': 0,
Expand All @@ -125,6 +131,7 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': EMPTY_GENERIC_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
Expand All @@ -137,7 +144,7 @@ def scenarios(self):
'benchmark_seconds': BENCHMARK_SECONDS
}
yield {
'name': 'generic_async_streaming_qps_one_server_core_%s'
'name': 'cpp_generic_async_streaming_qps_one_server_core_%s'
% secstr,
'num_servers': 1,
'num_clients': 0,
Expand All @@ -152,6 +159,7 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': EMPTY_GENERIC_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
Expand All @@ -164,7 +172,7 @@ def scenarios(self):
'benchmark_seconds': BENCHMARK_SECONDS
}
yield {
'name': 'protobuf_async_qps_unconstrained_%s'
'name': 'cpp_generic_async_qps_unconstrained_%s'
% secstr,
'num_servers': 1,
'num_clients': 0,
Expand All @@ -179,6 +187,7 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': EMPTY_GENERIC_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
Expand All @@ -191,7 +200,7 @@ def scenarios(self):
'benchmark_seconds': BENCHMARK_SECONDS
}
yield {
'name': 'single_channel_throughput_%s'
'name': 'cpp_single_channel_throughput_%s'
% secstr,
'num_servers': 1,
'num_clients': 1,
Expand All @@ -206,6 +215,7 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': BIG_GENERIC_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
Expand All @@ -218,7 +228,7 @@ def scenarios(self):
'benchmark_seconds': BENCHMARK_SECONDS
}
yield {
'name': 'protobuf_async_ping_pong_%s'
'name': 'cpp_protobuf_async_ping_pong_%s'
% secstr,
'num_servers': 1,
'num_clients': 1,
Expand All @@ -233,13 +243,13 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': EMPTY_PROTO_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
'server_type': 'ASYNC_SERVER',
'security_params': secargs,
'core_limit': SINGLE_MACHINE_CORES/2,
'async_server_threads': 1,
'payload_config': EMPTY_PROTO_PAYLOAD,
},
'warmup_seconds': WARMUP_SECONDS,
'benchmark_seconds': BENCHMARK_SECONDS
Expand All @@ -262,8 +272,9 @@ def worker_port_offset(self):

def scenarios(self):
# TODO(jtattermusch): add more scenarios
secargs = None
yield {
'name': 'csharp_async_generic_streaming_ping_pong',
'name': 'csharp_generic_async_streaming_ping_pong',
'num_servers': 1,
'num_clients': 1,
'client_config': {
Expand All @@ -277,11 +288,12 @@ def scenarios(self):
'closed_loop': {}
},
'payload_config': EMPTY_GENERIC_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
'security_params': secargs,
'core_limit': SINGLE_MACHINE_CORES/2,
'core_limit': 0,
'async_server_threads': 1,
'payload_config': EMPTY_GENERIC_PAYLOAD,
},
Expand All @@ -307,8 +319,9 @@ def worker_port_offset(self):

def scenarios(self):
# TODO(jtattermusch): add more scenarios
secargs = None
yield {
'name': 'node_sync_unary_ping_pong_protobuf',
'name': 'node_protobuf_unary_ping_pong',
'num_servers': 1,
'num_clients': 1,
'client_config': {
Expand All @@ -317,18 +330,18 @@ def scenarios(self):
'outstanding_rpcs_per_channel': 1,
'client_channels': 1,
'async_client_threads': 1,
'rpc_type': 'STREAMING',
'rpc_type': 'UNARY',
'load_params': {
'closed_loop': {}
},
'payload_config': EMPTY_PROTO_PAYLOAD,
'histogram_params': HISTOGRAM_PARAMS,
},
'server_config': {
'server_type': 'ASYNC_GENERIC_SERVER',
'server_type': 'ASYNC_SERVER',
'security_params': secargs,
'core_limit': SINGLE_MACHINE_CORES/2,
'core_limit': 0,
'async_server_threads': 1,
'payload_config': EMPTY_PROTO_PAYLOAD,
},
'warmup_seconds': WARMUP_SECONDS,
'benchmark_seconds': BENCHMARK_SECONDS
Expand Down

0 comments on commit 4fec48b

Please sign in to comment.