From 841e782ae502631f7094328fb520914a3f501075 Mon Sep 17 00:00:00 2001
From: vjpai <vpai@google.com>
Date: Wed, 20 Apr 2016 13:01:29 -0700
Subject: [PATCH] Just make this into a wrapper of the broader script with C++
only
---
tools/jenkins/run_performance.sh | 96 +-------------------------------
1 file changed, 1 insertion(+), 95 deletions(-)
diff --git a/tools/jenkins/run_performance.sh b/tools/jenkins/run_performance.sh
index c2c2e0b6af..2ad87f16a5 100755
--- a/tools/jenkins/run_performance.sh
+++ b/tools/jenkins/run_performance.sh
@@ -38,100 +38,6 @@ cd $(dirname $0)/../..
&& tools/profiling/latency_profile/run_latency_profile.sh \
|| true
-config=opt
-
-make CONFIG=$config qps_worker qps_json_driver -j8
-
-bins/$config/qps_worker -driver_port 10000 &
-PID1=$!
-bins/$config/qps_worker -driver_port 10010 &
-PID2=$!
-
-#
-# Put a timeout on these tests
-#
-((sleep 900; kill $$ && killall qps_worker && rm -f /tmp/qps-test.$$ )&)
-
-export QPS_WORKERS="localhost:10000,localhost:10010"
-
-# big is the size in bytes of large messages (0 is the size otherwise)
-big=65536
-
-# wide is the number of client channels in multi-channel tests (1 otherwise)
-wide=64
-
-# deep is the number of RPCs outstanding on a channel in non-ping-pong tests
-# (the value used is 1 otherwise)
-deep=100
-
-#
-# Get total core count
-cores=`grep -c ^processor /proc/cpuinfo || sysctl -n hw.ncpu`
-halfcores=`expr $cores / 2`
-
-for secure in true false; do
- # Scenario 1: generic async streaming ping-pong (contentionless latency)
- bins/$config/qps_driver --rpc_type=STREAMING --client_type=ASYNC_CLIENT \
- --server_type=ASYNC_GENERIC_SERVER --outstanding_rpcs_per_channel=1 \
- --client_channels=1 --bbuf_req_size=0 --bbuf_resp_size=0 \
- --async_client_threads=1 --async_server_threads=1 --secure_test=$secure \
- --num_servers=1 --num_clients=1 \
- --server_core_limit=$halfcores --client_core_limit=0
-
- # Scenario 2: generic async streaming "unconstrained" (QPS)
- bins/$config/qps_driver --rpc_type=STREAMING --client_type=ASYNC_CLIENT \
- --server_type=ASYNC_GENERIC_SERVER --outstanding_rpcs_per_channel=$deep \
- --client_channels=$wide --bbuf_req_size=0 --bbuf_resp_size=0 \
- --async_client_threads=0 --async_server_threads=0 --secure_test=$secure \
- --num_servers=1 --num_clients=0 \
- --server_core_limit=$halfcores --client_core_limit=0 2>&1 | \
- tee /tmp/qps-test.$$
-
- # Scenario 2b: QPS with a single server core
- bins/$config/qps_driver --rpc_type=STREAMING --client_type=ASYNC_CLIENT \
- --server_type=ASYNC_GENERIC_SERVER --outstanding_rpcs_per_channel=$deep \
- --client_channels=$wide --bbuf_req_size=0 --bbuf_resp_size=0 \
- --async_client_threads=0 --async_server_threads=0 --secure_test=$secure \
- --num_servers=1 --num_clients=0 --server_core_limit=1 --client_core_limit=0
-
- # Scenario 2c: protobuf-based QPS
- bins/$config/qps_driver --rpc_type=STREAMING --client_type=ASYNC_CLIENT \
- --server_type=ASYNC_SERVER --outstanding_rpcs_per_channel=$deep \
- --client_channels=$wide --simple_req_size=0 --simple_resp_size=0 \
- --async_client_threads=0 --async_server_threads=0 --secure_test=$secure \
- --num_servers=1 --num_clients=0 \
- --server_core_limit=$halfcores --client_core_limit=0
-
- # Scenario 3: Latency at sub-peak load (all clients equally loaded)
- for loadfactor in 0.7; do
- bins/$config/qps_driver --rpc_type=STREAMING --client_type=ASYNC_CLIENT \
- --server_type=ASYNC_GENERIC_SERVER --outstanding_rpcs_per_channel=$deep \
- --client_channels=$wide --bbuf_req_size=0 --bbuf_resp_size=0 \
- --async_client_threads=0 --async_server_threads=0 --secure_test=$secure \
- --num_servers=1 --num_clients=0 --poisson_load=`awk -v lf=$loadfactor \
- '$5 == "QPS:" {print int(lf * $6); exit}' /tmp/qps-test.$$` \
- --server_core_limit=$halfcores --client_core_limit=0
- done
-
- rm /tmp/qps-test.$$
-
- # Scenario 4: Single-channel bidirectional throughput test (like TCP_STREAM).
- bins/$config/qps_driver --rpc_type=STREAMING --client_type=ASYNC_CLIENT \
- --server_type=ASYNC_GENERIC_SERVER --outstanding_rpcs_per_channel=$deep \
- --client_channels=1 --bbuf_req_size=$big --bbuf_resp_size=$big \
- --async_client_threads=1 --async_server_threads=1 --secure_test=$secure \
- --num_servers=1 --num_clients=1 \
- --server_core_limit=$halfcores --client_core_limit=0
-
- # Scenario 5: Sync unary ping-pong with protobufs
- bins/$config/qps_driver --rpc_type=UNARY --client_type=SYNC_CLIENT \
- --server_type=SYNC_SERVER --outstanding_rpcs_per_channel=1 \
- --client_channels=1 --simple_req_size=0 --simple_resp_size=0 \
- --secure_test=$secure --num_servers=1 --num_clients=1 \
- --server_core_limit=$halfcores --client_core_limit=0
-
-done
-
-bins/$config/qps_json_driver --quit=true
+tools/run_tests/run_performance_tests.py -l c++
wait
--
GitLab