aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2017-01-27 10:54:05 -0800
committerGravatar Sree Kuchibhotla <sreek@google.com>2017-01-27 10:54:05 -0800
commit70d9ca402a69aa133b6e3e4fd5784022e8b30ff9 (patch)
tree4ba23212067daa4fa6226d2386cb1e9e96a93d38
parent8daca99390a56ad1c8aba74cefcc85a5ac1aa78a (diff)
Excluded async_client_sync_server_* tests for poll-cv engine since it
sometimes get stuck (or extremely slow). (https://github.com/grpc/grpc/issues/8545) created to debug poll-cv issues with async_client_sync_server perf tests
-rwxr-xr-xtest/cpp/qps/gen_build_yaml.py8
-rw-r--r--tools/run_tests/generated/tests.json100
-rw-r--r--tools/run_tests/performance/scenario_config.py13
-rwxr-xr-xtools/run_tests/run_tests.py2
4 files changed, 109 insertions, 14 deletions
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py
index 188d6196e5..2f035abedd 100755
--- a/test/cpp/qps/gen_build_yaml.py
+++ b/test/cpp/qps/gen_build_yaml.py
@@ -92,7 +92,8 @@ print yaml.dump({
'defaults': 'boringssl',
'cpu_cost': guess_cpu(scenario_json, False),
'exclude_configs': ['tsan', 'asan'],
- 'timeout_seconds': 6*60
+ 'timeout_seconds': 6*60,
+ 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', [])
}
for scenario_json in scenario_config.CXXLanguage().scenarios()
if 'scalable' in scenario_json.get('CATEGORIES', [])
@@ -109,8 +110,9 @@ print yaml.dump({
'defaults': 'boringssl',
'cpu_cost': guess_cpu(scenario_json, True),
'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')),
- 'timeout_seconds': 6*60
- }
+ 'timeout_seconds': 6*60,
+ 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', [])
+ }
for scenario_json in scenario_config.CXXLanguage().scenarios()
if 'scalable' in scenario_json.get('CATEGORIES', [])
]
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 2c7b0a6c82..feab4ea12e 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -38322,6 +38322,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38346,6 +38347,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38370,6 +38372,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38382,7 +38385,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -38394,6 +38397,9 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38406,7 +38412,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -38418,6 +38424,9 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38442,6 +38451,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38466,6 +38476,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38490,6 +38501,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38514,6 +38526,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38538,6 +38551,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38562,6 +38576,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38586,6 +38601,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38610,6 +38626,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38634,6 +38651,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38658,6 +38676,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38682,6 +38701,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38706,6 +38726,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38730,6 +38751,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38754,6 +38776,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38778,6 +38801,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38790,7 +38814,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -38802,6 +38826,9 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38814,7 +38841,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 100, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -38826,6 +38853,9 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38850,6 +38880,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38874,6 +38905,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38898,6 +38930,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38922,6 +38955,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38946,6 +38980,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38970,6 +39005,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -38994,6 +39030,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39018,6 +39055,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39042,6 +39080,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39066,6 +39105,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39090,6 +39130,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39114,6 +39155,7 @@
"tsan",
"asan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39151,6 +39193,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39188,6 +39231,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39225,6 +39269,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39237,7 +39282,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -39262,6 +39307,9 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39274,7 +39322,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": {\"use_test_ca\": true, \"server_host_override\": \"foo.test.google.fr\"}, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -39299,6 +39347,9 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39336,6 +39387,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39373,6 +39425,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39410,6 +39463,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39447,6 +39501,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39484,6 +39539,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39521,6 +39577,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39558,6 +39615,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39595,6 +39653,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39632,6 +39691,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39669,6 +39729,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39706,6 +39767,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39743,6 +39805,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39780,6 +39843,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39817,6 +39881,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39854,6 +39919,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39866,7 +39932,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"UNARY\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -39891,6 +39957,9 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39903,7 +39972,7 @@
{
"args": [
"--scenarios_json",
- "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"num_servers\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
+ "{\"scenarios\": [{\"name\": \"cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure\", \"warmup_seconds\": 0, \"benchmark_seconds\": 1, \"server_config\": {\"async_server_threads\": 0, \"security_params\": null, \"server_type\": \"SYNC_SERVER\"}, \"num_servers\": 1, \"num_clients\": 0, \"client_config\": {\"client_type\": \"ASYNC_CLIENT\", \"security_params\": null, \"payload_config\": {\"simple_params\": {\"resp_size\": 0, \"req_size\": 0}}, \"client_channels\": 64, \"async_client_threads\": 0, \"outstanding_rpcs_per_channel\": 10, \"rpc_type\": \"STREAMING\", \"load_params\": {\"closed_loop\": {}}, \"histogram_params\": {\"max_possible\": 60000000000.0, \"resolution\": 0.01}}}]}"
],
"boringssl": true,
"ci_platforms": [
@@ -39928,6 +39997,9 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [
+ "poll-cv"
+ ],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -39965,6 +40037,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40002,6 +40075,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40039,6 +40113,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40076,6 +40151,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40113,6 +40189,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40150,6 +40227,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40187,6 +40265,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40224,6 +40303,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40261,6 +40341,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40298,6 +40379,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40335,6 +40417,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
@@ -40372,6 +40455,7 @@
"stapprof",
"ubsan"
],
+ "excluded_poll_engines": [],
"flaky": false,
"language": "c++",
"name": "json_run_localhost",
diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py
index b20bb40eb1..d516182c9c 100644
--- a/tools/run_tests/performance/scenario_config.py
+++ b/tools/run_tests/performance/scenario_config.py
@@ -92,6 +92,7 @@ def remove_nonproto_fields(scenario):
scenario.pop('CATEGORIES', None)
scenario.pop('CLIENT_LANGUAGE', None)
scenario.pop('SERVER_LANGUAGE', None)
+ scenario.pop('EXCLUDED_POLL_ENGINES', None)
return scenario
@@ -114,7 +115,8 @@ def _ping_pong_scenario(name, rpc_type,
categories=DEFAULT_CATEGORIES,
channels=None,
outstanding=None,
- resource_quota_size=None):
+ resource_quota_size=None,
+ excluded_poll_engines=[]):
"""Creates a basic ping pong scenario."""
scenario = {
'name': name,
@@ -173,6 +175,9 @@ def _ping_pong_scenario(name, rpc_type,
scenario['SERVER_LANGUAGE'] = server_language
if categories:
scenario['CATEGORIES'] = categories
+ if len(excluded_poll_engines):
+ # The polling engines for which this scenario is excluded
+ scenario['EXCLUDED_POLL_ENGINES'] = excluded_poll_engines
return scenario
@@ -228,7 +233,8 @@ class CXXLanguage:
server_type='SYNC_SERVER',
unconstrained_client='async',
secure=secure,
- categories=smoketest_categories + [SCALABLE])
+ categories=smoketest_categories + [SCALABLE],
+ excluded_poll_engines = ['poll-cv'])
yield _ping_pong_scenario(
'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_%s' % secstr,
@@ -237,7 +243,8 @@ class CXXLanguage:
server_type='SYNC_SERVER',
unconstrained_client='async',
secure=secure,
- categories=smoketest_categories+[SCALABLE])
+ categories=smoketest_categories+[SCALABLE],
+ excluded_poll_engines = ['poll-cv'])
for rpc_type in ['unary', 'streaming']:
for synchronicity in ['sync', 'async']:
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 5aae3432e1..a46783e316 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -234,6 +234,8 @@ class CLanguage(object):
timeout_scaling = 1
if polling_strategy == 'poll-cv':
timeout_scaling *= 5
+ if polling_strategy in target.get('excluded_poll_engines', []):
+ continue;
if self.config.build_config in target['exclude_configs']:
continue
if self.args.iomgr_platform in target.get('exclude_iomgrs', []):