From 50eeff2f0543763c4c8a815ed3f13ff7f9df094e Mon Sep 17 00:00:00 2001 From: Hubert Bugaj Date: Sun, 5 Mar 2023 14:19:33 +0100 Subject: [PATCH 1/2] switch back to bojand/ghz image --- analyze.sh | 1 + bench.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/analyze.sh b/analyze.sh index ef6509a0..72c63f3f 100755 --- a/analyze.sh +++ b/analyze.sh @@ -22,4 +22,5 @@ $(git log -1 --pretty="%h %cD %cn %s") - GRPC_CLIENT_QPS=${GRPC_CLIENT_QPS} - GRPC_CLIENT_CPUS=${GRPC_CLIENT_CPUS} - GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO} +- GRPC_GHZ_TAG=${GRPC_GHZ_TAG} EOF diff --git a/bench.sh b/bench.sh index 866d58af..fe7113c0 100755 --- a/bench.sh +++ b/bench.sh @@ -17,6 +17,7 @@ export GRPC_CLIENT_QPS=$(( GRPC_CLIENT_QPS / GRPC_CLIENT_CONCURRENCY )) export GRPC_CLIENT_CPUS=${GRPC_CLIENT_CPUS:-"1"} export GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO:-"complex_proto"} export GRPC_IMAGE_NAME="${GRPC_IMAGE_NAME:-grpc_bench}" +export GRPC_GHZ_TAG="${GRPC_GHZ_TAG:-0.114.0}" # Let containers know how many CPUs they will be running on # Additionally export other vars for further analysis script. @@ -75,9 +76,11 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do docker run --name ghz --rm --network=host -v "${PWD}/proto:/proto:ro" \ -v "${PWD}/payload:/payload:ro" \ --cpus $GRPC_CLIENT_CPUS \ - obvionaoe/ghz:v0.103.0 \ + ghcr.io/bojand/ghz:"${GRPC_GHZ_TAG}" \ --proto=/proto/helloworld/helloworld.proto \ --call=helloworld.Greeter.SayHello \ + --disable-template-functions \ + --disable-template-data \ --insecure \ --concurrency="${GRPC_CLIENT_CONCURRENCY}" \ --connections="${GRPC_CLIENT_CONNECTIONS}" \ @@ -101,9 +104,11 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do docker run --name ghz --rm --network=host -v "${PWD}/proto:/proto:ro" \ -v "${PWD}/payload:/payload:ro" \ --cpus $GRPC_CLIENT_CPUS \ - obvionaoe/ghz:v0.103.0 \ + ghcr.io/bojand/ghz:"${GRPC_GHZ_TAG}" \ --proto=/proto/helloworld/helloworld.proto \ --call=helloworld.Greeter.SayHello \ + --disable-template-functions \ + --disable-template-data \ --insecure \ --concurrency="${GRPC_CLIENT_CONCURRENCY}" \ --connections="${GRPC_CLIENT_CONNECTIONS}" \ From c529375b797af1530f5fc3c917994423bf6064e3 Mon Sep 17 00:00:00 2001 From: Hubert Bugaj Date: Sun, 5 Mar 2023 14:44:38 +0100 Subject: [PATCH 2/2] put dart grpc on hold --- .github/workflows/build.yml | 36 ------------------- .../.dockerignore | 0 .../Dockerfile | 0 .../bin/server.dart | 0 .../pubspec.lock | 0 .../pubspec.yaml | 0 6 files changed, 36 deletions(-) rename {dart_grpc_bench => dart_grpc_onhold}/.dockerignore (100%) rename {dart_grpc_bench => dart_grpc_onhold}/Dockerfile (100%) rename {dart_grpc_bench => dart_grpc_onhold}/bin/server.dart (100%) rename {dart_grpc_bench => dart_grpc_onhold}/pubspec.lock (100%) rename {dart_grpc_bench => dart_grpc_onhold}/pubspec.yaml (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e72a764a..457ecabd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -240,42 +240,6 @@ jobs: GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - dart_grpc_bench: - runs-on: ubuntu-latest - needs: - - set-image-name - - changed - if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'dart_grpc_bench/') - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Build dart_grpc_bench - run: ./build.sh dart_grpc_bench - env: - GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - - - name: Benchmark dart_grpc_bench - run: ./bench.sh dart_grpc_bench - env: - GRPC_BENCHMARK_DURATION: 30s - GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - - - if: github.ref == 'refs/heads/master' - name: Log in to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - if: github.ref == 'refs/heads/master' - name: If on master push image to GHCR - run: docker push $GRPC_IMAGE_NAME:dart_grpc_bench-complex_proto - env: - GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }} - - dotnet_grpc_bench: runs-on: ubuntu-latest needs: diff --git a/dart_grpc_bench/.dockerignore b/dart_grpc_onhold/.dockerignore similarity index 100% rename from dart_grpc_bench/.dockerignore rename to dart_grpc_onhold/.dockerignore diff --git a/dart_grpc_bench/Dockerfile b/dart_grpc_onhold/Dockerfile similarity index 100% rename from dart_grpc_bench/Dockerfile rename to dart_grpc_onhold/Dockerfile diff --git a/dart_grpc_bench/bin/server.dart b/dart_grpc_onhold/bin/server.dart similarity index 100% rename from dart_grpc_bench/bin/server.dart rename to dart_grpc_onhold/bin/server.dart diff --git a/dart_grpc_bench/pubspec.lock b/dart_grpc_onhold/pubspec.lock similarity index 100% rename from dart_grpc_bench/pubspec.lock rename to dart_grpc_onhold/pubspec.lock diff --git a/dart_grpc_bench/pubspec.yaml b/dart_grpc_onhold/pubspec.yaml similarity index 100% rename from dart_grpc_bench/pubspec.yaml rename to dart_grpc_onhold/pubspec.yaml