Skip to content

Commit e7fc12f

Browse files
committed
removed topology input and cluster mode drivers
Signed-off-by: Lior Sventitzky <liorsve@amazon.com>
1 parent 804793c commit e7fc12f

11 files changed

Lines changed: 12 additions & 99 deletions

.github/workflows/benchmark.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ on:
3333
- reference-workload-10-client
3434
- reference-workload-1-client
3535
default: "reference-workload-10-client"
36-
topology:
37-
description: "Server topology"
38-
required: true
39-
type: choice
40-
options:
41-
- standalone
42-
- cluster
43-
default: "standalone"
4436
primary_version:
4537
description: "Primary driver version. Leave empty for spring-data-valkey (uses branch HEAD)."
4638
required: false
@@ -57,7 +49,7 @@ on:
5749
type: string
5850
default: ""
5951
custom_driver_config:
60-
description: "Custom driver config JSON (overrides driver/topology selection)"
52+
description: "Custom driver config JSON (overrides driver selection)"
6153
required: false
6254
type: string
6355
default: ""
@@ -100,15 +92,13 @@ jobs:
10092
PRIMARY_DRIVER="${{ github.event.inputs.primary_driver }}"
10193
SECONDARY_DRIVER="${{ github.event.inputs.secondary_driver }}"
10294
WORKLOAD="${{ github.event.inputs.workload }}"
103-
TOPOLOGY="${{ github.event.inputs.topology }}"
10495
PRIMARY_VERSION="${{ github.event.inputs.primary_version }}"
10596
SECONDARY_VERSION="${{ github.event.inputs.secondary_version }}"
10697
JOB_ID_PREFIX="${{ github.event.inputs.job_id_prefix }}"
10798
10899
echo "primary_driver=$PRIMARY_DRIVER" >> $GITHUB_OUTPUT
109100
echo "secondary_driver=$SECONDARY_DRIVER" >> $GITHUB_OUTPUT
110101
echo "workload=$WORKLOAD" >> $GITHUB_OUTPUT
111-
echo "topology=$TOPOLOGY" >> $GITHUB_OUTPUT
112102
echo "primary_version=$PRIMARY_VERSION" >> $GITHUB_OUTPUT
113103
echo "secondary_version=$SECONDARY_VERSION" >> $GITHUB_OUTPUT
114104
echo "job_id_prefix=$JOB_ID_PREFIX" >> $GITHUB_OUTPUT
@@ -117,7 +107,6 @@ jobs:
117107
echo "Primary driver: $PRIMARY_DRIVER"
118108
echo "Secondary driver: $SECONDARY_DRIVER"
119109
echo "Workload: $WORKLOAD"
120-
echo "Topology: $TOPOLOGY"
121110
echo "Primary version: '${PRIMARY_VERSION}'"
122111
echo "Secondary version: '${SECONDARY_VERSION}'"
123112
echo "Job ID prefix: '${JOB_ID_PREFIX}'"
@@ -129,7 +118,6 @@ jobs:
129118
PRIMARY_DRIVER="${{ steps.inputs.outputs.primary_driver }}"
130119
SECONDARY_DRIVER="${{ steps.inputs.outputs.secondary_driver }}"
131120
WORKLOAD="${{ steps.inputs.outputs.workload }}"
132-
TOPOLOGY="${{ steps.inputs.outputs.topology }}"
133121
CONFIG_DIR=".github/workflows/benchmark_configs"
134122
CUSTOM_CONFIG_DIR="/tmp/custom_configs"
135123
mkdir -p "$CUSTOM_CONFIG_DIR"
@@ -167,10 +155,10 @@ jobs:
167155
if [ "$SECONDARY_DRIVER" = "valkey-glide" ]; then
168156
SECONDARY_IN_FILENAME="glide"
169157
fi
170-
DRIVER="${PRIMARY_DRIVER}-${SECONDARY_IN_FILENAME}-${TOPOLOGY}"
158+
DRIVER="${PRIMARY_DRIVER}-${SECONDARY_IN_FILENAME}-standalone"
171159
else
172160
# Standalone drivers (valkey-glide, jedis, lettuce, redisson)
173-
DRIVER="${PRIMARY_DRIVER}-${TOPOLOGY}"
161+
DRIVER="${PRIMARY_DRIVER}-standalone"
174162
if [ "$SECONDARY_DRIVER" != "none" ] && [ -n "$SECONDARY_DRIVER" ]; then
175163
echo "Note: secondary_driver '$SECONDARY_DRIVER' ignored for standalone driver '$PRIMARY_DRIVER'"
176164
fi

.github/workflows/benchmark_configs/README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ This directory contains configuration files for the benchmark CI workflow.
1010
| ------------------ | ------------------------------------ | ----------------------------------------------------------------------------------------- |
1111
| `primary_driver` | Client library to benchmark | `spring-data-valkey`, `spring-data-redis`, `valkey-glide`, `jedis`, `lettuce`, `redisson` |
1212
| `secondary_driver` | Underlying driver for spring-data-\* | `valkey-glide`, `jedis`, `lettuce`, `none` |
13-
| `topology` | Server topology | `standalone`, `cluster` |
1413
| `workload` | Test scenario | `reference-workload-10-client`, `reference-workload-1-client` |
1514

1615
### Custom Configs
@@ -19,7 +18,7 @@ For custom use cases, you can provide custom JSON configs directly:
1918

2019
| Input | Description |
2120
| ------------------------ | -------------------------------------------------------- |
22-
| `custom_driver_config` | Custom driver JSON (overrides driver/topology selection) |
21+
| `custom_driver_config` | Custom driver JSON (overrides driver selection) |
2322
| `custom_workload_config` | Custom workload JSON (overrides workload selection) |
2423

2524
### Version Inputs
@@ -38,18 +37,17 @@ The CI workflow maps your input selections to JSON config files using a naming c
3837

3938
The workflow constructs the driver config filename from your inputs:
4039

41-
| Primary Driver | Secondary Driver | Topology | Resolved File |
42-
| -------------------- | ---------------- | ------------ | -------------------------------------------- |
43-
| `valkey-glide` | (ignored) | `standalone` | `valkey-glide-standalone.json` |
44-
| `valkey-glide` | (ignored) | `cluster` | `valkey-glide-cluster.json` |
45-
| `spring-data-valkey` | `valkey-glide` | `standalone` | `spring-data-valkey-glide-standalone.json` |
46-
| `spring-data-valkey` | `valkey-glide` | `cluster` | `spring-data-valkey-glide-cluster.json` |
47-
| `spring-data-valkey` | `jedis` | `cluster` | `spring-data-valkey-jedis-cluster.json` |
40+
| Primary Driver | Secondary Driver | Resolved File |
41+
| -------------------- | ---------------- | -------------------------------------------- |
42+
| `valkey-glide` | (ignored) | `valkey-glide-standalone.json` |
43+
| `jedis` | (ignored) | `jedis-standalone.json` |
44+
| `spring-data-valkey` | `valkey-glide` | `spring-data-valkey-glide-standalone.json` |
45+
| `spring-data-valkey` | `jedis` | `spring-data-valkey-jedis-standalone.json` |
4846

4947
**Pattern:**
5048

51-
- Standalone drivers: `{primary_driver}-{topology}.json`
52-
- Spring-data drivers: `{primary_driver}-{secondary_driver}-{topology}.json`
49+
- Standalone drivers: `{primary_driver}-standalone.json`
50+
- Spring-data drivers: `{primary_driver}-{secondary_driver}-standalone.json`
5351
- Note: `valkey-glide` is shortened to `glide` in filenames
5452

5553
### Workload Config Resolution

.github/workflows/benchmark_configs/drivers/jedis-cluster.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/lettuce-cluster.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/redisson-cluster.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/spring-data-redis-jedis-cluster.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/spring-data-redis-lettuce-cluster.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/spring-data-valkey-glide-cluster.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/spring-data-valkey-jedis-cluster.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/benchmark_configs/drivers/spring-data-valkey-lettuce-cluster.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)