Merge github.com:grpc/grpc into flowctl+millis

2 files changed, 0 insertions, 78 deletions

diff --git a/tools/run_tests/performance/massage_qps_stats.py b/tools/run_tests/performance/massage_qps_stats.py
index a1a6aa4526..ebbfe6c26c 100644
--- a/tools/run_tests/performance/massage_qps_stats.py
+++ b/tools/run_tests/performance/massage_qps_stats.py
@@ -107,8 +107,6 @@ def massage_qps_stats(scenario_result):
     stats["core_executor_wakeup_initiated"] = massage_qps_stats_helpers.counter(core_stats, "executor_wakeup_initiated")
     stats["core_executor_queue_drained"] = massage_qps_stats_helpers.counter(core_stats, "executor_queue_drained")
     stats["core_executor_push_retries"] = massage_qps_stats_helpers.counter(core_stats, "executor_push_retries")
-    stats["core_executor_threads_created"] = massage_qps_stats_helpers.counter(core_stats, "executor_threads_created")
-    stats["core_executor_threads_used"] = massage_qps_stats_helpers.counter(core_stats, "executor_threads_used")
     stats["core_server_requested_calls"] = massage_qps_stats_helpers.counter(core_stats, "server_requested_calls")
     stats["core_server_slowpath_requests_queued"] = massage_qps_stats_helpers.counter(core_stats, "server_slowpath_requests_queued")
     h = massage_qps_stats_helpers.histogram(core_stats, "call_initial_size")
@@ -183,12 +181,6 @@ def massage_qps_stats(scenario_result):
     stats["core_http2_send_flowctl_per_write_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries)
     stats["core_http2_send_flowctl_per_write_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries)
     stats["core_http2_send_flowctl_per_write_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries)
-    h = massage_qps_stats_helpers.histogram(core_stats, "executor_closures_per_wakeup")
-    stats["core_executor_closures_per_wakeup"] = ",".join("%f" % x for x in h.buckets)
-    stats["core_executor_closures_per_wakeup_bkts"] = ",".join("%f" % x for x in h.boundaries)
-    stats["core_executor_closures_per_wakeup_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries)
-    stats["core_executor_closures_per_wakeup_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries)
-    stats["core_executor_closures_per_wakeup_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries)
     h = massage_qps_stats_helpers.histogram(core_stats, "server_cqs_checked")
     stats["core_server_cqs_checked"] = ",".join("%f" % x for x in h.buckets)
     stats["core_server_cqs_checked_bkts"] = ",".join("%f" % x for x in h.boundaries)
diff --git a/tools/run_tests/performance/scenario_result_schema.json b/tools/run_tests/performance/scenario_result_schema.json
index be52166915..169221d18c 100644
--- a/tools/run_tests/performance/scenario_result_schema.json
+++ b/tools/run_tests/performance/scenario_result_schema.json
@@ -547,16 +547,6 @@
       }, 
       {
         "mode": "NULLABLE", 
-        "name": "core_executor_threads_created", 
-        "type": "INTEGER"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_threads_used", 
-        "type": "INTEGER"
-      }, 
-      {
-        "mode": "NULLABLE", 
         "name": "core_server_requested_calls", 
         "type": "INTEGER"
       }, 
@@ -867,31 +857,6 @@
       }, 
       {
         "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup", 
-        "type": "STRING"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_bkts", 
-        "type": "STRING"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_50p", 
-        "type": "FLOAT"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_95p", 
-        "type": "FLOAT"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_99p", 
-        "type": "FLOAT"
-      }, 
-      {
-        "mode": "NULLABLE", 
         "name": "core_server_cqs_checked", 
         "type": "STRING"
       }, 
@@ -1379,16 +1344,6 @@
       }, 
       {
         "mode": "NULLABLE", 
-        "name": "core_executor_threads_created", 
-        "type": "INTEGER"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_threads_used", 
-        "type": "INTEGER"
-      }, 
-      {
-        "mode": "NULLABLE", 
         "name": "core_server_requested_calls", 
         "type": "INTEGER"
       }, 
@@ -1699,31 +1654,6 @@
       }, 
       {
         "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup", 
-        "type": "STRING"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_bkts", 
-        "type": "STRING"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_50p", 
-        "type": "FLOAT"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_95p", 
-        "type": "FLOAT"
-      }, 
-      {
-        "mode": "NULLABLE", 
-        "name": "core_executor_closures_per_wakeup_99p", 
-        "type": "FLOAT"
-      }, 
-      {
-        "mode": "NULLABLE", 
         "name": "core_server_cqs_checked", 
         "type": "STRING"
       },