Skip to content

Commit bd6e2a7

Browse files
rishabh6788rishabh6788
authored
Refresh benchmark configs to use 3.0.0-alpha1 version (#17476)
Signed-off-by: Rishabh Singh <sngri@amazon.com>
1 parent b1e66b3 commit bd6e2a7

File tree

2 files changed

+19
-104
lines changed

2 files changed

+19
-104
lines changed

‎.github/benchmark-configs.json

+18-103
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Cluster and opensearch-benchmark configurations",
33
"id_1": {
44
"description": "Indexing only configuration for NYC_TAXIS workload",
5-
"supported_major_versions": ["2", "3"],
5+
"supported_major_versions": ["3"],
66
"cluster-benchmark-configs": {
77
"SINGLE_NODE_CLUSTER": "true",
88
"MIN_DISTRIBUTION": "true",
@@ -19,7 +19,7 @@
1919
},
2020
"id_2": {
2121
"description": "Indexing only configuration for HTTP_LOGS workload",
22-
"supported_major_versions": ["2", "3"],
22+
"supported_major_versions": ["3"],
2323
"cluster-benchmark-configs": {
2424
"SINGLE_NODE_CLUSTER": "true",
2525
"MIN_DISTRIBUTION": "true",
@@ -41,7 +41,7 @@
4141
"SINGLE_NODE_CLUSTER": "true",
4242
"MIN_DISTRIBUTION": "true",
4343
"TEST_WORKLOAD": "nyc_taxis",
44-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
44+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-3x\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
4545
"CAPTURE_NODE_STAT": "true",
4646
"TEST_PROCEDURE": "restore-from-snapshot"
4747
},
@@ -52,81 +52,13 @@
5252
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
5353
},
5454
"id_4": {
55-
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.0.0",
56-
"supported_major_versions": ["3"],
57-
"cluster-benchmark-configs": {
58-
"SINGLE_NODE_CLUSTER": "true",
59-
"MIN_DISTRIBUTION": "true",
60-
"TEST_WORKLOAD": "http_logs",
61-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"http_logs_1_shard\"}",
62-
"CAPTURE_NODE_STAT": "true",
63-
"TEST_PROCEDURE": "restore-from-snapshot"
64-
},
65-
"cluster_configuration": {
66-
"size": "Single-Node",
67-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
68-
},
69-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
70-
},
71-
"id_5": {
7255
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.0.0",
7356
"supported_major_versions": ["3"],
7457
"cluster-benchmark-configs": {
7558
"SINGLE_NODE_CLUSTER": "true",
7659
"MIN_DISTRIBUTION": "true",
7760
"TEST_WORKLOAD": "big5",
78-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
79-
"CAPTURE_NODE_STAT": "true",
80-
"TEST_PROCEDURE": "restore-from-snapshot"
81-
},
82-
"cluster_configuration": {
83-
"size": "Single-Node",
84-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
85-
},
86-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
87-
},
88-
"id_6": {
89-
"description": "Search only test-procedure for NYC_TAXIS, uses snapshot to restore the data for OS-2.x",
90-
"supported_major_versions": ["2"],
91-
"cluster-benchmark-configs": {
92-
"SINGLE_NODE_CLUSTER": "true",
93-
"MIN_DISTRIBUTION": "true",
94-
"TEST_WORKLOAD": "nyc_taxis",
95-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
96-
"CAPTURE_NODE_STAT": "true",
97-
"TEST_PROCEDURE": "restore-from-snapshot"
98-
},
99-
"cluster_configuration": {
100-
"size": "Single-Node",
101-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
102-
},
103-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
104-
},
105-
"id_7": {
106-
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-2.x",
107-
"supported_major_versions": ["2"],
108-
"cluster-benchmark-configs": {
109-
"SINGLE_NODE_CLUSTER": "true",
110-
"MIN_DISTRIBUTION": "true",
111-
"TEST_WORKLOAD": "http_logs",
112-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots\",\"snapshot_name\":\"http_logs_1_shard\"}",
113-
"CAPTURE_NODE_STAT": "true",
114-
"TEST_PROCEDURE": "restore-from-snapshot"
115-
},
116-
"cluster_configuration": {
117-
"size": "Single-Node",
118-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
119-
},
120-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
121-
},
122-
"id_8": {
123-
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-2.x",
124-
"supported_major_versions": ["2"],
125-
"cluster-benchmark-configs": {
126-
"SINGLE_NODE_CLUSTER": "true",
127-
"MIN_DISTRIBUTION": "true",
128-
"TEST_WORKLOAD": "big5",
129-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
61+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-3x\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
13062
"CAPTURE_NODE_STAT": "true",
13163
"TEST_PROCEDURE": "restore-from-snapshot"
13264
},
@@ -136,9 +68,9 @@
13668
},
13769
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
13870
},
139-
"id_9": {
71+
"id_5": {
14072
"description": "Indexing and search configuration for pmc workload",
141-
"supported_major_versions": ["2", "3"],
73+
"supported_major_versions": ["3"],
14274
"cluster-benchmark-configs": {
14375
"SINGLE_NODE_CLUSTER": "true",
14476
"MIN_DISTRIBUTION": "true",
@@ -152,9 +84,9 @@
15284
},
15385
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
15486
},
155-
"id_10": {
87+
"id_6": {
15688
"description": "Indexing only configuration for stack-overflow workload",
157-
"supported_major_versions": ["2", "3"],
89+
"supported_major_versions": ["3"],
15890
"cluster-benchmark-configs": {
15991
"SINGLE_NODE_CLUSTER": "true",
16092
"MIN_DISTRIBUTION": "true",
@@ -168,15 +100,15 @@
168100
},
169101
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
170102
},
171-
"id_11": {
103+
"id_7": {
172104
"description": "Search only test-procedure for big5 with concurrent segment search setting enabled",
173105
"supported_major_versions": ["3"],
174106
"cluster-benchmark-configs": {
175107
"SINGLE_NODE_CLUSTER": "true",
176108
"MIN_DISTRIBUTION": "true",
177109
"TEST_WORKLOAD": "big5",
178110
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.enabled:true",
179-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
111+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-3x\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
180112
"CAPTURE_NODE_STAT": "true",
181113
"TEST_PROCEDURE": "restore-from-snapshot"
182114
},
@@ -186,15 +118,15 @@
186118
},
187119
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
188120
},
189-
"id_12": {
121+
"id_8": {
190122
"description": "Search only test-procedure for big5 with concurrent segment search mode as all",
191123
"supported_major_versions": ["3"],
192124
"cluster-benchmark-configs": {
193125
"SINGLE_NODE_CLUSTER": "true",
194126
"MIN_DISTRIBUTION": "true",
195127
"TEST_WORKLOAD": "big5",
196128
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:all",
197-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
129+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-3x\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
198130
"CAPTURE_NODE_STAT": "true",
199131
"TEST_PROCEDURE": "restore-from-snapshot"
200132
},
@@ -204,15 +136,15 @@
204136
},
205137
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
206138
},
207-
"id_13": {
139+
"id_9": {
208140
"description": "Search only test-procedure for big5 with concurrent segment search mode as auto",
209141
"supported_major_versions": ["3"],
210142
"cluster-benchmark-configs": {
211143
"SINGLE_NODE_CLUSTER": "true",
212144
"MIN_DISTRIBUTION": "true",
213145
"TEST_WORKLOAD": "big5",
214146
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:auto",
215-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
147+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-3x\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
216148
"CAPTURE_NODE_STAT": "true",
217149
"TEST_PROCEDURE": "restore-from-snapshot"
218150
},
@@ -222,31 +154,14 @@
222154
},
223155
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
224156
},
225-
"id_14": {
157+
"id_10": {
226158
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.0.0. Enables range query approximation.",
227159
"supported_major_versions": ["3"],
228160
"cluster-benchmark-configs": {
229161
"SINGLE_NODE_CLUSTER": "true",
230162
"MIN_DISTRIBUTION": "true",
231163
"TEST_WORKLOAD": "big5",
232164
"ADDITIONAL_CONFIG": "opensearch.experimental.feature.approximate_point_range_query.enabled:true",
233-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
234-
"CAPTURE_NODE_STAT": "true",
235-
"TEST_PROCEDURE": "restore-from-snapshot"
236-
},
237-
"cluster_configuration": {
238-
"size": "Single-Node",
239-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
240-
},
241-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
242-
},
243-
"id_15": {
244-
"description": "Search only test-procedure for big5, uses lucene-10 index snapshot to restore the data for OS-3.0.0",
245-
"supported_major_versions": ["3"],
246-
"cluster-benchmark-configs": {
247-
"SINGLE_NODE_CLUSTER": "true",
248-
"MIN_DISTRIBUTION": "true",
249-
"TEST_WORKLOAD": "big5",
250165
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-3x\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
251166
"CAPTURE_NODE_STAT": "true",
252167
"TEST_PROCEDURE": "restore-from-snapshot"
@@ -257,9 +172,9 @@
257172
},
258173
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
259174
},
260-
"id_16": {
175+
"id_11": {
261176
"description": "Benchmarking config for NESTED workload, benchmarks nested queries with inner-hits",
262-
"supported_major_versions": ["2", "3"],
177+
"supported_major_versions": ["3"],
263178
"cluster-benchmark-configs": {
264179
"SINGLE_NODE_CLUSTER": "true",
265180
"MIN_DISTRIBUTION": "true",
@@ -273,4 +188,4 @@
273188
},
274189
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
275190
}
276-
}
191+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
echo "PR_NUMBER=${{ github.event.issue.number }}" >> $GITHUB_ENV
2323
echo "REPOSITORY=${{ github.event.repository.full_name }}" >> $GITHUB_ENV
2424
OPENSEARCH_VERSION=$(awk -F '=' '/^opensearch[[:space:]]*=/ {gsub(/[[:space:]]/, "", $2); print $2}' buildSrc/version.properties)
25-
echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV
25+
echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION-alpha1" >> $GITHUB_ENV
2626
major_version=$(echo $OPENSEARCH_VERSION | cut -d'.' -f1)
2727
echo "OPENSEARCH_MAJOR_VERSION=$major_version" >> $GITHUB_ENV
2828
echo "USER_TAGS=pull_request_number:${{ github.event.issue.number }},repository:OpenSearch" >> $GITHUB_ENV

0 commit comments

Comments
 (0)