Skip to content

Commit f980924

Browse files
authored
Add baseline-cluster-config key to benchmark config (opensearch-project#15134)
Signed-off-by: Rishabh Singh <sngri@amazon.com>
1 parent 2829a89 commit f980924

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

.github/benchmark-configs.json

+22-12
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"cluster_configuration": {
1515
"size": "Single-Node",
1616
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
17-
}
17+
},
18+
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
1819
},
1920
"id_2": {
2021
"description": "Indexing only configuration for HTTP_LOGS workload",
@@ -30,7 +31,8 @@
3031
"cluster_configuration": {
3132
"size": "Single-Node",
3233
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
33-
}
34+
},
35+
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
3436
},
3537
"id_3": {
3638
"description": "Search only test-procedure for NYC_TAXIS, uses snapshot to restore the data for OS-3.0.0",
@@ -46,7 +48,8 @@
4648
"cluster_configuration": {
4749
"size": "Single-Node",
4850
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
49-
}
51+
},
52+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
5053
},
5154
"id_4": {
5255
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.0.0",
@@ -62,10 +65,11 @@
6265
"cluster_configuration": {
6366
"size": "Single-Node",
6467
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
65-
}
68+
},
69+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
6670
},
6771
"id_5": {
68-
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.0.0",
72+
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.0.0",
6973
"supported_major_versions": ["3"],
7074
"cluster-benchmark-configs": {
7175
"SINGLE_NODE_CLUSTER": "true",
@@ -78,7 +82,8 @@
7882
"cluster_configuration": {
7983
"size": "Single-Node",
8084
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
81-
}
85+
},
86+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
8287
},
8388
"id_6": {
8489
"description": "Search only test-procedure for NYC_TAXIS, uses snapshot to restore the data for OS-2.x",
@@ -94,7 +99,8 @@
9499
"cluster_configuration": {
95100
"size": "Single-Node",
96101
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
97-
}
102+
},
103+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
98104
},
99105
"id_7": {
100106
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-2.x",
@@ -110,10 +116,11 @@
110116
"cluster_configuration": {
111117
"size": "Single-Node",
112118
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
113-
}
119+
},
120+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
114121
},
115122
"id_8": {
116-
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-2.x",
123+
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-2.x",
117124
"supported_major_versions": ["2"],
118125
"cluster-benchmark-configs": {
119126
"SINGLE_NODE_CLUSTER": "true",
@@ -126,7 +133,8 @@
126133
"cluster_configuration": {
127134
"size": "Single-Node",
128135
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
129-
}
136+
},
137+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
130138
},
131139
"id_9": {
132140
"description": "Indexing and search configuration for pmc workload",
@@ -141,7 +149,8 @@
141149
"cluster_configuration": {
142150
"size": "Single-Node",
143151
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
144-
}
152+
},
153+
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
145154
},
146155
"id_10": {
147156
"description": "Indexing only configuration for stack-overflow workload",
@@ -156,6 +165,7 @@
156165
"cluster_configuration": {
157166
"size": "Single-Node",
158167
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
159-
}
168+
},
169+
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
160170
}
161171
}

.github/workflows/benchmark-pull-request.yml

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
for (const [key, value] of Object.entries(clusterBenchmarkConfigs)) {
6161
core.exportVariable(key, value);
6262
}
63+
if (benchmarkConfigs[configId].hasOwnProperty('baseline_cluster_config')) {
64+
core.exportVariable('BASELINE_CLUSTER_CONFIG', benchmarkConfigs[configId]['baseline_cluster_config']);
6365
- name: Post invalid format comment
6466
if: steps.check_comment.outputs.invalid == 'true'
6567
uses: actions/github-script@v7

0 commit comments

Comments
 (0)