From 2b850ab773fc2aec17c189b3d424857724542385 Mon Sep 17 00:00:00 2001 From: tellet-q Date: Tue, 4 Jun 2024 08:45:23 +0200 Subject: [PATCH 1/4] Fix github triggers Fix github triggers: redis on manual trigger Fix github triggers: paths-filter Fix github triggers: debug --- .../manual-all-engines-benchmark.yaml | 113 +++++++++++------- .../weaviate-single-node/docker-compose.yaml | 2 +- 2 files changed, 72 insertions(+), 43 deletions(-) diff --git a/.github/workflows/manual-all-engines-benchmark.yaml b/.github/workflows/manual-all-engines-benchmark.yaml index 38737409..b916c8c6 100644 --- a/.github/workflows/manual-all-engines-benchmark.yaml +++ b/.github/workflows/manual-all-engines-benchmark.yaml @@ -8,130 +8,159 @@ on: types: - opened - reopened + - edited workflow_dispatch: jobs: elasticsearchBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/elasticsearch') || - startsWith(github.event.head_commit.modified, 'engine/servers/elasticsearch') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - elasticsearch-default - random-100 - against elasticsearch-single-node-ci runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + elasticsearch: + - 'engine/clients/elasticsearch/**' + - 'engine/servers/elasticsearch-single-node/**' + - 'engine/servers/elasticsearch-single-node-ci/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.elasticsearch == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "elasticsearch-default" dataset: "random-100" compose_file: "engine/servers/elasticsearch-single-node-ci/docker-compose.yaml" milvusBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/milvus') || - startsWith(github.event.head_commit.modified, 'engine/servers/milvus') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - milvus-default - random-100 - against milvus-single-node runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + milvus: + - 'engine/clients/milvus/**' + - 'engine/servers/milvus-single-node/**' + - 'engine/servers/milvus-limit-ram/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.milvus == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "milvus-default" dataset: "random-100" compose_file: "engine/servers/milvus-single-node/docker-compose.yaml" opensearchBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/opensearch') || - startsWith(github.event.head_commit.modified, 'engine/servers/opensearch') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - opensearch-default - glove-25-angular - against opensearch-single-node-ci runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + opensearch: + - 'engine/clients/opensearch/**' + - 'engine/servers/opensearch-single-node/**' + - 'engine/servers/opensearch-single-node-ci/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.opensearch == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "opensearch-default" dataset: "glove-25-angular" compose_file: "engine/servers/opensearch-single-node-ci/docker-compose.yaml" pgvectorBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/pgvector') || - startsWith(github.event.head_commit.modified, 'engine/servers/pgvector') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - pgvector-default - random-100 - against pgvector-single-node runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + pgvector: + - 'engine/clients/pgvector/**' + - 'engine/servers/pgvector-single-node/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.pgvector == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "pgvector-default" dataset: "random-100" compose_file: "engine/servers/pgvector-single-node/docker-compose.yaml" qdrantBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/qdrant') || - startsWith(github.event.head_commit.modified, 'engine/servers/qdrant') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - qdrant-default - random-100 - against qdrant-single-node runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + qdrant: + - 'engine/clients/qdrant/**' + - 'engine/servers/qdrant-single-node/**' + - 'engine/servers/qdrant-limit-ram/**' + - 'engine/servers/qdrant-billion-scale/**' + - 'engine/servers/qdrant-cluster-mode/**' + - 'engine/servers/qdrant-continuous-benchmarks/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.qdrant == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "qdrant-default" dataset: "random-100" compose_file: "engine/servers/qdrant-single-node/docker-compose.yaml" redisBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/redis') || - startsWith(github.event.head_commit.modified, 'engine/servers/redis') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - redis-default - random-100 - against redis-single-node runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + redis: + - 'engine/clients/redis/**' + - 'engine/servers/redis-single-node/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.weaviate == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "redis-default" dataset: "random-100" compose_file: "engine/servers/redis-single-node/docker-compose.yaml" weaviateBenchmark: - if: > - ( - startsWith(github.event.head_commit.modified, 'engine/clients/weaviate') || - startsWith(github.event.head_commit.modified, 'engine/servers/weaviate') || - startsWith(github.event.head_commit.modified, 'engine/base_client/') - ) name: benchmark - weaviate-default - random-100 - against weaviate-single-node runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + weaviate: + - 'engine/clients/weaviate/**' + - 'engine/servers/weaviate-single-node/**' + - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark + if: steps.changes.outputs.weaviate == 'true' || ${{ github.event_name == 'workflow_dispatch' }} with: engine: "weaviate-default" dataset: "random-100" diff --git a/engine/servers/weaviate-single-node/docker-compose.yaml b/engine/servers/weaviate-single-node/docker-compose.yaml index e5e9e9ec..f7a594f2 100644 --- a/engine/servers/weaviate-single-node/docker-compose.yaml +++ b/engine/servers/weaviate-single-node/docker-compose.yaml @@ -26,4 +26,4 @@ services: deploy: resources: limits: - memory: 27Gb + memory: 27Gb # debug comment to check github triggers new From 9c21e116291f629e81ffada67e0ca1e855f7dd3a Mon Sep 17 00:00:00 2001 From: tellet-q Date: Tue, 4 Jun 2024 10:37:08 +0200 Subject: [PATCH 2/4] fix --- .../workflows/manual-all-engines-benchmark.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/manual-all-engines-benchmark.yaml b/.github/workflows/manual-all-engines-benchmark.yaml index b916c8c6..6bb189b4 100644 --- a/.github/workflows/manual-all-engines-benchmark.yaml +++ b/.github/workflows/manual-all-engines-benchmark.yaml @@ -28,7 +28,7 @@ jobs: - 'engine/servers/elasticsearch-single-node-ci/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.elasticsearch == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.elasticsearch == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "elasticsearch-default" dataset: "random-100" @@ -50,7 +50,7 @@ jobs: - 'engine/servers/milvus-limit-ram/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.milvus == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.milvus == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "milvus-default" dataset: "random-100" @@ -72,7 +72,7 @@ jobs: - 'engine/servers/opensearch-single-node-ci/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.opensearch == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.opensearch == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "opensearch-default" dataset: "glove-25-angular" @@ -93,7 +93,7 @@ jobs: - 'engine/servers/pgvector-single-node/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.pgvector == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.pgvector == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "pgvector-default" dataset: "random-100" @@ -118,7 +118,7 @@ jobs: - 'engine/servers/qdrant-continuous-benchmarks/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.qdrant == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.qdrant == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "qdrant-default" dataset: "random-100" @@ -139,7 +139,7 @@ jobs: - 'engine/servers/redis-single-node/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.weaviate == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.weaviate == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "redis-default" dataset: "random-100" @@ -160,8 +160,8 @@ jobs: - 'engine/servers/weaviate-single-node/**' - 'engine/base_client/**' - uses: ./.github/workflows/actions/run-engine-benchmark - if: steps.changes.outputs.weaviate == 'true' || ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ steps.changes.outputs.weaviate == 'true' || github.event_name == 'workflow_dispatch' }} with: engine: "weaviate-default" dataset: "random-100" - compose_file: "engine/servers/weaviate-single-node/docker-compose.yaml" + compose_file: "engine/servers/weaviate-single-node/docker-compose.yaml" \ No newline at end of file From 972ef9258fd0ae0d6a81a18e0ba0d94cd2061551 Mon Sep 17 00:00:00 2001 From: tellet-q Date: Tue, 4 Jun 2024 10:52:24 +0200 Subject: [PATCH 3/4] Do not trigger on PR edit --- .github/workflows/manual-all-engines-benchmark.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/manual-all-engines-benchmark.yaml b/.github/workflows/manual-all-engines-benchmark.yaml index 6bb189b4..ccb2a487 100644 --- a/.github/workflows/manual-all-engines-benchmark.yaml +++ b/.github/workflows/manual-all-engines-benchmark.yaml @@ -8,7 +8,6 @@ on: types: - opened - reopened - - edited workflow_dispatch: jobs: From d74904a59f2da5a4ed36aecfc17f3549da2a3a59 Mon Sep 17 00:00:00 2001 From: tellet-q Date: Wed, 5 Jun 2024 09:26:06 +0200 Subject: [PATCH 4/4] Revert unrelated changes --- engine/servers/weaviate-single-node/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/servers/weaviate-single-node/docker-compose.yaml b/engine/servers/weaviate-single-node/docker-compose.yaml index f7a594f2..e5e9e9ec 100644 --- a/engine/servers/weaviate-single-node/docker-compose.yaml +++ b/engine/servers/weaviate-single-node/docker-compose.yaml @@ -26,4 +26,4 @@ services: deploy: resources: limits: - memory: 27Gb # debug comment to check github triggers new + memory: 27Gb