Skip to content

Commit c48f853

Browse files
author
Peter Alfonsi
committed
Merge branch 'main' into fd-cache-items
2 parents 4e8abbe + 387e663 commit c48f853

File tree

617 files changed

+32173
-2722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

617 files changed

+32173
-2722
lines changed

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ BWC_VERSION:
5050
- "3.0.0"
5151
- "3.1.0"
5252
- "3.2.0"
53+
- "3.3.0"

‎.github/benchmark-configs.json‎

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,13 @@
3535
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
3636
},
3737
"id_3": {
38-
"description": "Search only test-procedure for NYC_TAXIS, uses snapshot to restore the data for OS-3.0.0",
39-
"supported_major_versions": ["3"],
40-
"cluster-benchmark-configs": {
41-
"SINGLE_NODE_CLUSTER": "true",
42-
"MIN_DISTRIBUTION": "true",
43-
"TEST_WORKLOAD": "nyc_taxis",
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\"}",
45-
"CAPTURE_NODE_STAT": "true",
46-
"TEST_PROCEDURE": "restore-from-snapshot"
47-
},
48-
"cluster_configuration": {
49-
"size": "Single-Node",
50-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
51-
},
52-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
53-
},
54-
"id_4": {
5538
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.x",
5639
"supported_major_versions": ["3"],
5740
"cluster-benchmark-configs": {
5841
"SINGLE_NODE_CLUSTER": "true",
5942
"MIN_DISTRIBUTION": "true",
6043
"TEST_WORKLOAD": "big5",
61-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.2.1\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
44+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
6245
"CAPTURE_NODE_STAT": "true",
6346
"TEST_PROCEDURE": "restore-from-snapshot"
6447
},
@@ -68,7 +51,7 @@
6851
},
6952
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
7053
},
71-
"id_5": {
54+
"id_4": {
7255
"description": "Indexing and search configuration for pmc workload",
7356
"supported_major_versions": ["3"],
7457
"cluster-benchmark-configs": {
@@ -84,7 +67,7 @@
8467
},
8568
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
8669
},
87-
"id_6": {
70+
"id_5": {
8871
"description": "Indexing only configuration for stack-overflow workload",
8972
"supported_major_versions": ["3"],
9073
"cluster-benchmark-configs": {
@@ -100,15 +83,15 @@
10083
},
10184
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
10285
},
103-
"id_7": {
86+
"id_6": {
10487
"description": "Search only test-procedure for big5 with concurrent segment search setting enabled",
10588
"supported_major_versions": ["3"],
10689
"cluster-benchmark-configs": {
10790
"SINGLE_NODE_CLUSTER": "true",
10891
"MIN_DISTRIBUTION": "true",
10992
"TEST_WORKLOAD": "big5",
11093
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.enabled:true",
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\"}",
94+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
11295
"CAPTURE_NODE_STAT": "true",
11396
"TEST_PROCEDURE": "restore-from-snapshot"
11497
},
@@ -118,15 +101,15 @@
118101
},
119102
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
120103
},
121-
"id_8": {
104+
"id_7": {
122105
"description": "Search only test-procedure for big5 with concurrent segment search mode as all",
123106
"supported_major_versions": ["3"],
124107
"cluster-benchmark-configs": {
125108
"SINGLE_NODE_CLUSTER": "true",
126109
"MIN_DISTRIBUTION": "true",
127110
"TEST_WORKLOAD": "big5",
128111
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:all",
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\"}",
112+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
130113
"CAPTURE_NODE_STAT": "true",
131114
"TEST_PROCEDURE": "restore-from-snapshot"
132115
},
@@ -136,15 +119,15 @@
136119
},
137120
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
138121
},
139-
"id_9": {
122+
"id_8": {
140123
"description": "Search only test-procedure for big5 with concurrent segment search mode as auto",
141124
"supported_major_versions": ["3"],
142125
"cluster-benchmark-configs": {
143126
"SINGLE_NODE_CLUSTER": "true",
144127
"MIN_DISTRIBUTION": "true",
145128
"TEST_WORKLOAD": "big5",
146129
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:auto",
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\"}",
130+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
148131
"CAPTURE_NODE_STAT": "true",
149132
"TEST_PROCEDURE": "restore-from-snapshot"
150133
},
@@ -154,15 +137,15 @@
154137
},
155138
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
156139
},
157-
"id_10": {
140+
"id_9": {
158141
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.0.0. Enables range query approximation.",
159142
"supported_major_versions": ["3"],
160143
"cluster-benchmark-configs": {
161144
"SINGLE_NODE_CLUSTER": "true",
162145
"MIN_DISTRIBUTION": "true",
163146
"TEST_WORKLOAD": "big5",
164147
"ADDITIONAL_CONFIG": "opensearch.experimental.feature.approximate_point_range_query.enabled:true",
165-
"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\"}",
148+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
166149
"CAPTURE_NODE_STAT": "true",
167150
"TEST_PROCEDURE": "restore-from-snapshot"
168151
},
@@ -172,7 +155,7 @@
172155
},
173156
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
174157
},
175-
"id_11": {
158+
"id_10": {
176159
"description": "Benchmarking config for NESTED workload, benchmarks nested queries with inner-hits",
177160
"supported_major_versions": ["3"],
178161
"cluster-benchmark-configs": {
@@ -188,31 +171,14 @@
188171
},
189172
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
190173
},
191-
"id_12": {
192-
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.0.0",
193-
"supported_major_versions": ["3"],
194-
"cluster-benchmark-configs": {
195-
"SINGLE_NODE_CLUSTER": "true",
196-
"MIN_DISTRIBUTION": "true",
197-
"TEST_WORKLOAD": "http_logs",
198-
"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\":\"http_logs_1_shard\"}",
199-
"CAPTURE_NODE_STAT": "true",
200-
"TEST_PROCEDURE": "restore-from-snapshot"
201-
},
202-
"cluster_configuration": {
203-
"size": "Single-Node",
204-
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
205-
},
206-
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
207-
},
208-
"id_13": {
174+
"id_11": {
209175
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.x",
210176
"supported_major_versions": ["3"],
211177
"cluster-benchmark-configs": {
212178
"SINGLE_NODE_CLUSTER": "true",
213179
"MIN_DISTRIBUTION": "true",
214180
"TEST_WORKLOAD": "http_logs",
215-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.2.1\",\"snapshot_name\":\"http_logs_1_shard\"}",
181+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"http_logs_1_shard\"}",
216182
"CAPTURE_NODE_STAT": "true",
217183
"TEST_PROCEDURE": "restore-from-snapshot"
218184
},
@@ -222,14 +188,14 @@
222188
},
223189
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
224190
},
225-
"id_14": {
191+
"id_12": {
226192
"description": "Search only test-procedure for NYC_TAXIS, uses snapshot to restore the data for OS-3.x",
227193
"supported_major_versions": ["3"],
228194
"cluster-benchmark-configs": {
229195
"SINGLE_NODE_CLUSTER": "true",
230196
"MIN_DISTRIBUTION": "true",
231197
"TEST_WORKLOAD": "nyc_taxis",
232-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.2.1\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
198+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
233199
"CAPTURE_NODE_STAT": "true",
234200
"TEST_PROCEDURE": "restore-from-snapshot"
235201
},

‎.github/workflows/create-documentation-issue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
3030
- name: Create Issue From File
3131
id: create-issue
32-
uses: peter-evans/create-issue-from-file@v5
32+
uses: peter-evans/create-issue-from-file@v6
3333
with:
3434
title: Add documentation related to new feature
3535
content-filepath: ./ci/documentation/issue.md

‎.github/workflows/gradle-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: Create Comment Success
124124
if: ${{ github.event_name == 'pull_request_target' && success() && env.result == 'SUCCESS' }}
125-
uses: peter-evans/create-or-update-comment@v4
125+
uses: peter-evans/create-or-update-comment@v5
126126
with:
127127
issue-number: ${{ env.pr_number }}
128128
body: |
@@ -145,7 +145,7 @@ jobs:
145145
146146
- name: Create Comment Flaky
147147
if: ${{ github.event_name == 'pull_request_target' && success() && env.result != 'SUCCESS' }}
148-
uses: peter-evans/create-or-update-comment@v4
148+
uses: peter-evans/create-or-update-comment@v5
149149
with:
150150
issue-number: ${{ env.pr_number }}
151151
body: |
@@ -155,7 +155,7 @@ jobs:
155155
156156
- name: Create Comment Failure
157157
if: ${{ github.event_name == 'pull_request_target' && failure() }}
158-
uses: peter-evans/create-or-update-comment@v4
158+
uses: peter-evans/create-or-update-comment@v5
159159
with:
160160
issue-number: ${{ env.pr_number }}
161161
body: |

‎.github/workflows/links.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v5
1414
- name: lychee Link Checker
1515
id: lychee
16-
uses: lycheeverse/lychee-action@v2.4.1
16+
uses: lycheeverse/lychee-action@v2.6.1
1717
with:
1818
args: --accept=200,403,429 --exclude-mail **/*.html **/*.md **/*.txt **/*.json --exclude-file .lychee.excludes
1919
fail: true

‎.github/workflows/poc-checklist.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
issues: write
1212
steps:
1313
- name: Add comment
14-
uses: peter-evans/create-or-update-comment@v4
14+
uses: peter-evans/create-or-update-comment@v5
1515
with:
1616
issue-number: ${{ github.event.issue.number }}
1717
body: |

‎.github/workflows/publish-maven-snapshots.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,14 @@ jobs:
3232
export-env: true
3333
env:
3434
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
35-
SONATYPE_USERNAME: op://opensearch-infra-secrets/maven-central-portal-credentials/username
36-
SONATYPE_PASSWORD: op://opensearch-infra-secrets/maven-central-portal-credentials/password
35+
MAVEN_SNAPSHOTS_S3_REPO: op://opensearch-infra-secrets/maven-snapshots-s3/repo
36+
MAVEN_SNAPSHOTS_S3_ROLE: op://opensearch-infra-secrets/maven-snapshots-s3/role
37+
38+
- name: Configure AWS credentials
39+
uses: aws-actions/configure-aws-credentials@v5
40+
with:
41+
role-to-assume: ${{ env.MAVEN_SNAPSHOTS_S3_ROLE }}
42+
aws-region: us-east-1
3743

3844
- name: Publish snapshots to maven
3945
run: |

0 commit comments

Comments
 (0)