From 9ba52e7aa99eb9f71af09616e5b61e03654b90de Mon Sep 17 00:00:00 2001 From: Yuxuan Li Date: Wed, 9 Nov 2016 14:45:25 -0800 Subject: [PATCH 1/4] unblock the performance tests. hide the cpu usage field for now. --- tools/run_tests/performance/bq_upload_result.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/run_tests/performance/bq_upload_result.py b/tools/run_tests/performance/bq_upload_result.py index 0ea23d22122..5d0fcfa67aa 100755 --- a/tools/run_tests/performance/bq_upload_result.py +++ b/tools/run_tests/performance/bq_upload_result.py @@ -122,6 +122,7 @@ def _flatten_result_inplace(scenario_result): scenario_result['clientSuccess'] = json.dumps(scenario_result['clientSuccess']) scenario_result['serverSuccess'] = json.dumps(scenario_result['serverSuccess']) scenario_result['requestResults'] = json.dumps(scenario_result.get('requestResults', [])) + scenario_result['summary'].pop('serverCpuUsage', None) scenario_result['summary'].pop('successfulRequestsPerSecond', None) scenario_result['summary'].pop('failedRequestsPerSecond', None) From 2b4d3726203f96fb0e51215e118bec33e8d3493c Mon Sep 17 00:00:00 2001 From: Yuxuan Li Date: Wed, 9 Nov 2016 15:06:00 -0800 Subject: [PATCH 2/4] hiding totalCpuTime and idleCpuTime from ServerStatus proto message --- tools/run_tests/performance/bq_upload_result.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/performance/bq_upload_result.py b/tools/run_tests/performance/bq_upload_result.py index 5d0fcfa67aa..995f1fda63f 100755 --- a/tools/run_tests/performance/bq_upload_result.py +++ b/tools/run_tests/performance/bq_upload_result.py @@ -125,7 +125,8 @@ def _flatten_result_inplace(scenario_result): scenario_result['summary'].pop('serverCpuUsage', None) scenario_result['summary'].pop('successfulRequestsPerSecond', None) scenario_result['summary'].pop('failedRequestsPerSecond', None) - + scenario_result['stats'].pop('totalCpuTime', None) + scenario_result['stats'].pop('idleCpuTime', None) def _populate_metadata_inplace(scenario_result): """Populates metadata based on environment variables set by Jenkins.""" From 317f60b98ee5d0f90c1486644aecd692d03f5f24 Mon Sep 17 00:00:00 2001 From: Yuxuan Li Date: Wed, 9 Nov 2016 15:08:26 -0800 Subject: [PATCH 3/4] add a blank line back --- tools/run_tests/performance/bq_upload_result.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/run_tests/performance/bq_upload_result.py b/tools/run_tests/performance/bq_upload_result.py index 995f1fda63f..2bdd94e36bc 100755 --- a/tools/run_tests/performance/bq_upload_result.py +++ b/tools/run_tests/performance/bq_upload_result.py @@ -128,6 +128,7 @@ def _flatten_result_inplace(scenario_result): scenario_result['stats'].pop('totalCpuTime', None) scenario_result['stats'].pop('idleCpuTime', None) + def _populate_metadata_inplace(scenario_result): """Populates metadata based on environment variables set by Jenkins.""" # NOTE: Grabbing the Jenkins environment variables will only work if the From d885a27ccb130269b6222833108846ba57113da9 Mon Sep 17 00:00:00 2001 From: Yuxuan Li Date: Wed, 9 Nov 2016 15:46:06 -0800 Subject: [PATCH 4/4] fix repeated field --- tools/run_tests/performance/bq_upload_result.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/performance/bq_upload_result.py b/tools/run_tests/performance/bq_upload_result.py index 2bdd94e36bc..ddcf053ae5e 100755 --- a/tools/run_tests/performance/bq_upload_result.py +++ b/tools/run_tests/performance/bq_upload_result.py @@ -115,6 +115,9 @@ def _flatten_result_inplace(scenario_result): scenario_result['scenario']['clientConfig'] = json.dumps(scenario_result['scenario']['clientConfig']) scenario_result['scenario']['serverConfig'] = json.dumps(scenario_result['scenario']['serverConfig']) scenario_result['latencies'] = json.dumps(scenario_result['latencies']) + for stats in scenario_result['serverStats']: + stats.pop('totalCpuTime', None) + stats.pop('idleCpuTime', None) for stats in scenario_result['clientStats']: stats['latencies'] = json.dumps(stats['latencies']) stats.pop('requestResults', None) @@ -125,8 +128,6 @@ def _flatten_result_inplace(scenario_result): scenario_result['summary'].pop('serverCpuUsage', None) scenario_result['summary'].pop('successfulRequestsPerSecond', None) scenario_result['summary'].pop('failedRequestsPerSecond', None) - scenario_result['stats'].pop('totalCpuTime', None) - scenario_result['stats'].pop('idleCpuTime', None) def _populate_metadata_inplace(scenario_result):