From b774e1655dca04591067894bb0328fcb3aa77d5a Mon Sep 17 00:00:00 2001 From: BodoBolero Date: Mon, 27 Jan 2025 10:49:56 +0100 Subject: [PATCH] Revert "reduce number of stripe sizes tested and add a test for postgres version 17" This reverts commit 4ab4510a84f4d3b39be298997e33ba1e1c565c24. --- .github/workflows/ingest_benchmark.yml | 35 +++++++++++++++----------- vendor/postgres-v14 | 2 +- vendor/postgres-v15 | 2 +- vendor/postgres-v16 | 2 +- vendor/postgres-v17 | 2 +- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ingest_benchmark.yml b/.github/workflows/ingest_benchmark.yml index 7b303fa37a..f59a1a30fe 100644 --- a/.github/workflows/ingest_benchmark.yml +++ b/.github/workflows/ingest_benchmark.yml @@ -29,22 +29,29 @@ jobs: fail-fast: false # allow other variants to continue even if one fails matrix: include: - - target_project: new_empty_project_stripe_size_2048 + - target_project: new_empty_project + stripe_size: 128 # 1 MiB + - target_project: new_empty_project + stripe_size: 256 # 2 MiB + - target_project: new_empty_project + stripe_size: 512 # 4 MiB + - target_project: new_empty_project + stripe_size: 1024 # 8 MiB + - target_project: new_empty_project stripe_size: 2048 # 16 MiB - postgres_version: 16 - - target_project: new_empty_project_stripe_size_32768 + - target_project: new_empty_project + stripe_size: 4096 # 32 MiB + - target_project: new_empty_project + stripe_size: 8192 # 64 MiB + - target_project: new_empty_project + stripe_size: 16384 # 128 MiB + - target_project: new_empty_project stripe_size: 32768 # 256 MiB # note that this is different from null because using null will shard_split the project only if it reaches the threshold # while here it is sharded from the beginning with a shard size of 256 MiB - postgres_version: 16 - target_project: new_empty_project stripe_size: null # run with neon defaults which will shard split only when reaching the threshold - postgres_version: 16 - - target_project: new_empty_project - stripe_size: null # run with neon defaults which will shard split only when reaching the threshold - postgres_version: 17 - target_project: large_existing_project stripe_size: null # cannot re-shared or choose different stripe size for existing, already sharded project - postgres_version: 16 max-parallel: 1 # we want to run each stripe size sequentially to be able to compare the results permissions: contents: write @@ -84,12 +91,12 @@ jobs: aws-oicd-role-arn: ${{ vars.DEV_AWS_OIDC_ROLE_ARN }} - name: Create Neon Project - if: ${{ startsWith(matrix.target_project, 'new_empty_project') }} + if: ${{ matrix.target_project == 'new_empty_project' }} id: create-neon-project-ingest-target uses: ./.github/actions/neon-project-create with: region_id: aws-us-east-2 - postgres_version: ${{ matrix.postgres_version }} + postgres_version: 16 compute_units: '[7, 7]' # we want to test large compute here to avoid compute-side bottleneck api_key: ${{ secrets.NEON_STAGING_API_KEY }} shard_split_project: ${{ matrix.stripe_size != null && 'true' || 'false' }} @@ -98,7 +105,7 @@ jobs: stripe_size: ${{ matrix.stripe_size }} - name: Initialize Neon project - if: ${{ startsWith(matrix.target_project, 'new_empty_project') }} + if: ${{ matrix.target_project == 'new_empty_project' }} env: BENCHMARK_INGEST_TARGET_CONNSTR: ${{ steps.create-neon-project-ingest-target.outputs.dsn }} NEW_PROJECT_ID: ${{ steps.create-neon-project-ingest-target.outputs.project_id }} @@ -151,7 +158,7 @@ jobs: test_selection: performance/test_perf_ingest_using_pgcopydb.py run_in_parallel: false extra_params: -s -m remote_cluster --timeout 86400 -k test_ingest_performance_using_pgcopydb - pg_version: v${{ matrix.postgres_version }} + pg_version: v16 save_perf_report: true aws-oicd-role-arn: ${{ vars.DEV_AWS_OIDC_ROLE_ARN }} env: @@ -167,7 +174,7 @@ jobs: ${PSQL} "${BENCHMARK_INGEST_TARGET_CONNSTR}" -c "\dt+" - name: Delete Neon Project - if: ${{ always() && startsWith(matrix.target_project, 'new_empty_project') }} + if: ${{ always() && matrix.target_project == 'new_empty_project' }} uses: ./.github/actions/neon-project-delete with: project_id: ${{ steps.create-neon-project-ingest-target.outputs.project_id }} diff --git a/vendor/postgres-v14 b/vendor/postgres-v14 index 46082f2088..c2f65b3201 160000 --- a/vendor/postgres-v14 +++ b/vendor/postgres-v14 @@ -1 +1 @@ -Subproject commit 46082f20884f087a2d974b33ac65d63af26142bd +Subproject commit c2f65b3201591e02ce45b66731392f98d3388e73 diff --git a/vendor/postgres-v15 b/vendor/postgres-v15 index dd0b28d6fb..f262d631ad 160000 --- a/vendor/postgres-v15 +++ b/vendor/postgres-v15 @@ -1 +1 @@ -Subproject commit dd0b28d6fbad39e227f3b77296fcca879af8b3a9 +Subproject commit f262d631ad477a1819e84a183e5a7ef561830085 diff --git a/vendor/postgres-v16 b/vendor/postgres-v16 index d674efd776..97f9fde349 160000 --- a/vendor/postgres-v16 +++ b/vendor/postgres-v16 @@ -1 +1 @@ -Subproject commit d674efd776f59d78e8fa1535bd2f95c3e6984fca +Subproject commit 97f9fde349c6de6d573f5ce96db07eca60ce6185 diff --git a/vendor/postgres-v17 b/vendor/postgres-v17 index a8dd6e779d..7e3f3974bc 160000 --- a/vendor/postgres-v17 +++ b/vendor/postgres-v17 @@ -1 +1 @@ -Subproject commit a8dd6e779dde907778006adb436b557ad652fb97 +Subproject commit 7e3f3974bc8895938308f94d0e96879ffae638cd