introduce grpc scenarios instead of fixed proto and variable payloads

.gitignore

@@ -1,2 +1,4 @@
 results/
 *.tmp
+proto/
+payload/

README.md

@@ -52,7 +52,7 @@ The benchmark can be configured through the following environment variables:
 |--------|---------------|:---------------:|
 |GRPC_BENCHMARK_DURATION|Duration of the benchmark.|20s|
 |GRPC_BENCHMARK_WARMUP|Duration of the warmup. Stats won't be collected.|5s|
-|GRPC_REQUEST_PAYLOAD|File (from [payload/](payload/)) containing the data to be sent in the client request.|100B|
+|GRPC_REQUEST_SCENARIO|Scenario (from [scenarios/](scenarios/)) containing the protobuf and the data to be sent in the client request. It is advised to pass this argument to `build.sh` and run the former each time `helloworld.proto` is different from the previously ran scenario.|string_100B|
 |GRPC_SERVER_CPUS|Maximum number of cpus used by the server.|1|
 |GRPC_SERVER_RAM|Maximum memory used by the server.|512m|
 |GRPC_CLIENT_CONNECTIONS|Number of connections to use.|50|
@@ -67,6 +67,6 @@ The benchmark can be configured through the following environment variables:
 Other parameters will depend on your use-case. Choose wisely.
 
 # Results
-You can find our sample results in the [Wiki](https://github.com/LesnyRumcajs/grpc_bench/wiki). Be sure to run the benchmarks yourself if you have sufficient hardware, especially for multi-core scenarios. 
+You can find our sample results in the [Wiki](https://github.com/LesnyRumcajs/grpc_bench/wiki). Be sure to run the benchmarks yourself if you have sufficient hardware, especially for multi-core scenarios.
 
 

analyze.sh

@@ -21,5 +21,5 @@ $(git log -1 --pretty="%h %cD %cn %s")
 - GRPC_CLIENT_CONCURRENCY=${GRPC_CLIENT_CONCURRENCY}
 - GRPC_CLIENT_QPS=${GRPC_CLIENT_QPS}
 - GRPC_CLIENT_CPUS=${GRPC_CLIENT_CPUS}
-- GRPC_REQUEST_PAYLOAD=${GRPC_REQUEST_PAYLOAD}
+- GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO}
 EOF

bench.sh

@@ -15,7 +15,7 @@ export GRPC_CLIENT_CONCURRENCY=${GRPC_CLIENT_CONCURRENCY:-"1000"}
 export GRPC_CLIENT_QPS=${GRPC_CLIENT_QPS:-"0"}
 export GRPC_CLIENT_QPS=$(( GRPC_CLIENT_QPS / GRPC_CLIENT_CONCURRENCY ))
 export GRPC_CLIENT_CPUS=${GRPC_CLIENT_CPUS:-"1"}
-export GRPC_REQUEST_PAYLOAD=${GRPC_REQUEST_PAYLOAD:-"100B"}
+export GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO:-"string_100B"}
 
 # Let containers know how many CPUs they will be running on
 # Additionally export other vars for further analysis script.
@@ -34,6 +34,12 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do
 
 	mkdir -p "${RESULTS_DIR}"
 
+	# Setup the chosen scenario
+    if ! sh setup_scenario.sh $GRPC_REQUEST_SCENARIO true; then
+  		echo "Scenario setup fiascoed."
+  		exit 1
+	fi
+
 	# Start the gRPC Server container
 	docker run --name "${NAME}" --rm \
 		--cpus "${GRPC_SERVER_CPUS}" \
@@ -60,7 +66,7 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do
             --connections="${GRPC_CLIENT_CONNECTIONS}" \
             --rps="${GRPC_CLIENT_QPS}" \
             --duration "${GRPC_BENCHMARK_WARMUP}" \
-            --data-file /payload/"${GRPC_REQUEST_PAYLOAD}" \
+            --data-file /payload/payload \
     		127.0.0.1:50051 > /dev/null
 
     	echo "done."
@@ -86,7 +92,7 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do
         --connections="${GRPC_CLIENT_CONNECTIONS}" \
         --rps="${GRPC_CLIENT_QPS}" \
         --duration "${GRPC_BENCHMARK_DURATION}" \
-        --data-file /payload/"${GRPC_REQUEST_PAYLOAD}" \
+        --data-file /payload/payload \
 		127.0.0.1:50051 >"${RESULTS_DIR}/${NAME}".report
 
 	# Show quick summary (reqs/sec)

build.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+export GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO:-"string_100B"}
+
 # Build ghz Docker image.
 # See ghz-tool/Dockerfile for details/version
 docker build -t ghz_bench:latest ./ghz-tool/
@@ -9,6 +11,12 @@ BENCHMARKS_TO_BUILD="${@}"
 ##  ...or use all the *_bench dirs by default
 BENCHMARKS_TO_BUILD="${BENCHMARKS_TO_BUILD:-$(find . -maxdepth 1 -name '*_bench' -type d | sort)}"
 
+# Setup the chosen scenario
+if ! sh setup_scenario.sh $GRPC_REQUEST_SCENARIO false; then
+	echo "Scenario setup fiascoed."
+	exit 1
+fi
+
 builds=""
 for benchmark in ${BENCHMARKS_TO_BUILD}; do
 	echo "==> Building Docker image for ${benchmark}..."

rust_tonic_st_bench/src/main.rs

@@ -20,7 +20,7 @@ impl Greeter for MyGreeter {
         request: Request<HelloRequest>,
     ) -> Result<Response<HelloReply>, Status> {
         let reply = hello_world::HelloReply {
-            message: request.into_inner().name,
+            response: request.into_inner().request,
         };
         Ok(Response::new(reply))
     }