Skip to content

Commit d12be33

Browse files
dk2kdk2k
authored
Merge branch 'opensearch-project:main' into dk_remove_unneeded_array
2 parents fd3bb33 + ec7b652 commit d12be33

File tree

1,239 files changed

+69585
-11194
lines changed

Some content is hidden

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

1,239 files changed

+69585
-11194
lines changed

‎.ci/bwcVersions

+3
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ BWC_VERSION:
3838
- "2.16.0"
3939
- "2.16.1"
4040
- "2.17.0"
41+
- "2.17.1"
42+
- "2.17.2"
43+
- "2.18.0"

‎.github/benchmark-configs.json

+74-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"SINGLE_NODE_CLUSTER": "true",
7676
"MIN_DISTRIBUTION": "true",
7777
"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\"}",
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\"}",
7979
"CAPTURE_NODE_STAT": "true",
8080
"TEST_PROCEDURE": "restore-from-snapshot"
8181
},
@@ -126,7 +126,7 @@
126126
"SINGLE_NODE_CLUSTER": "true",
127127
"MIN_DISTRIBUTION": "true",
128128
"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\"}",
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\"}",
130130
"CAPTURE_NODE_STAT": "true",
131131
"TEST_PROCEDURE": "restore-from-snapshot"
132132
},
@@ -167,5 +167,77 @@
167167
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
168168
},
169169
"baseline_cluster_config": "x64-r5.xlarge-single-node-1-shard-0-replica-baseline"
170+
},
171+
"id_11": {
172+
"description": "Search only test-procedure for big5 with concurrent segment search setting enabled",
173+
"supported_major_versions": ["3"],
174+
"cluster-benchmark-configs": {
175+
"SINGLE_NODE_CLUSTER": "true",
176+
"MIN_DISTRIBUTION": "true",
177+
"TEST_WORKLOAD": "big5",
178+
"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\"}",
180+
"CAPTURE_NODE_STAT": "true",
181+
"TEST_PROCEDURE": "restore-from-snapshot"
182+
},
183+
"cluster_configuration": {
184+
"size": "Single-Node",
185+
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
186+
},
187+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
188+
},
189+
"id_12": {
190+
"description": "Search only test-procedure for big5 with concurrent segment search mode as all",
191+
"supported_major_versions": ["3"],
192+
"cluster-benchmark-configs": {
193+
"SINGLE_NODE_CLUSTER": "true",
194+
"MIN_DISTRIBUTION": "true",
195+
"TEST_WORKLOAD": "big5",
196+
"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\"}",
198+
"CAPTURE_NODE_STAT": "true",
199+
"TEST_PROCEDURE": "restore-from-snapshot"
200+
},
201+
"cluster_configuration": {
202+
"size": "Single-Node",
203+
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
204+
},
205+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
206+
},
207+
"id_13": {
208+
"description": "Search only test-procedure for big5 with concurrent segment search mode as auto",
209+
"supported_major_versions": ["3"],
210+
"cluster-benchmark-configs": {
211+
"SINGLE_NODE_CLUSTER": "true",
212+
"MIN_DISTRIBUTION": "true",
213+
"TEST_WORKLOAD": "big5",
214+
"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\"}",
216+
"CAPTURE_NODE_STAT": "true",
217+
"TEST_PROCEDURE": "restore-from-snapshot"
218+
},
219+
"cluster_configuration": {
220+
"size": "Single-Node",
221+
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
222+
},
223+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
224+
},
225+
"id_14": {
226+
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.0.0. Enables range query approximation.",
227+
"supported_major_versions": ["3"],
228+
"cluster-benchmark-configs": {
229+
"SINGLE_NODE_CLUSTER": "true",
230+
"MIN_DISTRIBUTION": "true",
231+
"TEST_WORKLOAD": "big5",
232+
"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"
170242
}
171243
}

‎.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,12 @@ updates:
722722
- directory: /plugins/
723723
open-pull-requests-limit: 1
724724
package-ecosystem: gradle
725+
ignore:
726+
# For all packages, ignore all major versions to minimize breaking issues
727+
- dependency-name: "com.google.cloud:google-cloud-storage"
728+
update-types: [ "version-update:semver-major" ]
729+
- dependency-name: "com.google.api-client:google-api-client"
730+
update-types: [ "version-update:semver-major" ]
725731
schedule:
726732
interval: weekly
727733
labels:

‎.github/workflows/assemble.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ jobs:
3030
- name: Setup docker (missing on MacOS)
3131
id: setup_docker
3232
if: runner.os == 'macos'
33-
uses: douglascamata/setup-docker-macos-action@main
3433
continue-on-error: true
35-
with:
36-
upgrade-qemu: true
37-
colima: v0.6.8
34+
run: |
35+
# Force QEMU 9.0.2 usage
36+
curl https://raw.githubusercontent.com/Homebrew/homebrew-core/f1a9cf104a9a51779c7a532b658c490f69974839/Formula/q/qemu.rb > qemu.rb
37+
brew install qemu.rb
38+
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install docker colima coreutils
39+
gtimeout 15m colima start
40+
shell: bash
3841
- name: Run Gradle (assemble)
3942
if: runner.os == 'macos' && steps.setup_docker.outcome != 'success'
4043
run: |

‎.github/workflows/delete_backport_branch.yml

+12-5
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@ on:
77
jobs:
88
delete-branch:
99
runs-on: ubuntu-latest
10-
if: startsWith(github.event.pull_request.head.ref,'backport/')
10+
permissions:
11+
contents: write
12+
if: github.repository == 'opensearch-project/OpenSearch' && startsWith(github.event.pull_request.head.ref,'backport/')
1113
steps:
12-
- name: Delete merged branch
13-
uses: SvanBoxel/delete-merged-branch@main
14-
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
- name: Delete merged branch
15+
uses: actions/github-script@v7
16+
with:
17+
script: |
18+
github.rest.git.deleteRef({
19+
owner: context.repo.owner,
20+
repo: context.repo.repo,
21+
ref: `heads/${context.payload.pull_request.head.ref}`,
22+
})

‎.github/workflows/gradle-check.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
pull_request_target:
99
types: [opened, synchronize, reopened]
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
13+
cancel-in-progress: true
14+
1115
permissions:
1216
contents: read # to fetch code (actions/checkout)
1317

@@ -20,7 +24,7 @@ jobs:
2024
- uses: actions/checkout@v4
2125
- name: Get changed files
2226
id: changed-files-specific
23-
uses: tj-actions/changed-files@v44
27+
uses: tj-actions/changed-files@v45
2428
with:
2529
files_ignore: |
2630
release-notes/*.md

‎.github/workflows/links.yml

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

‎.github/workflows/precommit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
java: [ 11, 17, 21 ]
10+
java: [ 11, 17, 21, 23 ]
1111
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
1212
steps:
1313
- uses: actions/checkout@v4

‎.github/workflows/version.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Create PR for BASE
6464
id: base_pr
65-
uses: peter-evans/create-pull-request@v6
65+
uses: peter-evans/create-pull-request@v7
6666
with:
6767
base: ${{ env.BASE }}
6868
branch: 'create-pull-request/patch-${{ env.BASE }}'
@@ -88,7 +88,7 @@ jobs:
8888

8989
- name: Create PR for BASE_X
9090
id: base_x_pr
91-
uses: peter-evans/create-pull-request@v6
91+
uses: peter-evans/create-pull-request@v7
9292
with:
9393
base: ${{ env.BASE_X }}
9494
branch: 'create-pull-request/patch-${{ env.BASE_X }}'
@@ -114,7 +114,7 @@ jobs:
114114

115115
- name: Create PR for main
116116
id: main_pr
117-
uses: peter-evans/create-pull-request@v6
117+
uses: peter-evans/create-pull-request@v7
118118
with:
119119
base: main
120120
branch: 'create-pull-request/patch-main'

0 commit comments

Comments
 (0)