Skip to content

Commit 340162d

Browse files
cwperkscwperks
committed
Merge branch 'main' into ignore-simulate
2 parents 10f411a + 332f4c5 commit 340162d

File tree

10 files changed

+224
-76
lines changed

10 files changed

+224
-76
lines changed

‎.github/CODEOWNERS

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,27 @@
1-
* @abbashus @adnapibar @anasalkouz @andrross @Bukhtawar @CEHENKLE @dblock @dbwiddis @dreamer-89 @gbbafna @kartg @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @peternied @reta @Rishikesh1159 @ryanbogan @sachinpkale @saratvemulapalli @setiah @shwetathareja @sohami @tlfeng @VachaShah
1+
# CODEOWNERS manages notifications, not PR approvals
2+
# For PR approvals see /.github/workflows/maintainer-approval.yml
3+
4+
# Files have a single rule applied, the last match decides the owner
5+
# If you would like to more specifically apply ownership, include existing owner in new sub fields
6+
7+
# To verify changes of CODEOWNERS file
8+
# In VSCode
9+
# 1. Install extension https://marketplace.visualstudio.com/items?itemName=jasonnutter.vscode-codeowners
10+
# 2. Go to a file
11+
# 3. Use the command palette to run the CODEOWNERS: Show owners of current file command, which will display all code owners for the current file.
12+
13+
# Default ownership for all repo files
14+
* @abbashus @adnapibar @anasalkouz @andrross @Bukhtawar @CEHENKLE @dblock @dbwiddis @dreamer-89 @gbbafna @kartg @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @ryanbogan @sachinpkale @saratvemulapalli @setiah @shwetathareja @sohami @tlfeng @VachaShah
15+
16+
/modules/transport-netty4/ @peternied
17+
18+
/plugins/identity-shiro/ @peternied
19+
20+
/server/src/main/java/org/opensearch/extensions/ @peternied
21+
/server/src/main/java/org/opensearch/identity/ @peternied
22+
/server/src/main/java/org/opensearch/threadpool/ @peternied
23+
/server/src/main/java/org/opensearch/transport/ @peternied
24+
25+
/.github/ @peternied
26+
27+
/MAINTAINERS.md @abbashus @adnapibar @anasalkouz @andrross @Bukhtawar @CEHENKLE @dblock @dbwiddis @dreamer-89 @gbbafna @kartg @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @peternied @reta @Rishikesh1159 @ryanbogan @sachinpkale @saratvemulapalli @setiah @shwetathareja @sohami @tlfeng @VachaShah

‎.github/ISSUE_TEMPLATE/bug_template.md

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

‎.github/ISSUE_TEMPLATE/bug_template.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: 🐛 Bug report
2+
description: Create a report to help us improve
3+
title: "[BUG] <title>"
4+
labels: ['bug, untriaged']
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: Describe the bug
9+
description: A clear and concise description of what the bug is.
10+
validations:
11+
required: true
12+
- type: dropdown
13+
attributes:
14+
label: Related component
15+
description: Choose a specific OpenSearch component your bug belongs to. If you are unsure which to select or if the component is not present, select "Other".
16+
multiple: false
17+
options:
18+
- Other
19+
- Build
20+
- Clients
21+
- Cluster Manager
22+
- Extensions
23+
- Indexing:Performance
24+
- Indexing:Replication
25+
- Indexing
26+
- Libraries
27+
- Plugins
28+
- Search:Aggregations
29+
- Search:Performance
30+
- Search:Query Capabilities
31+
- Search:Query Insights
32+
- Search:Relevance
33+
- Search:Remote Search
34+
- Search:Resiliency
35+
- Search:Searchable Snapshots
36+
- Search
37+
- Storage:Durability
38+
- Storage:Performance
39+
- Storage:Remote
40+
- Storage:Snapshots
41+
- Storage
42+
validations:
43+
required: true
44+
- type: textarea
45+
attributes:
46+
label: To Reproduce
47+
description: Steps to reproduce the behavior.
48+
value: |
49+
1. Go to '...'
50+
2. Click on '....'
51+
3. Scroll down to '....'
52+
4. See error
53+
validations:
54+
required: true
55+
- type: textarea
56+
attributes:
57+
label: Expected behavior
58+
description: A clear and concise description of what you expected to happen.
59+
validations:
60+
required: true
61+
- type: textarea
62+
attributes:
63+
label: Additional Details
64+
description: Add any other context about the problem here.
65+
value: |
66+
**Plugins**
67+
Please list all plugins currently enabled.
68+
69+
**Screenshots**
70+
If applicable, add screenshots to help explain your problem.
71+
72+
**Host/Environment (please complete the following information):**
73+
- OS: [e.g. iOS]
74+
- Version [e.g. 22]
75+
76+
**Additional context**
77+
Add any other context about the problem here.
78+
validations:
79+
required: false

‎.github/ISSUE_TEMPLATE/feature_request.md

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

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: 🎆 Feature request
2+
description: Suggest an idea for this project
3+
title: '[Feature Request] <title>'
4+
labels: ['enhancement, untriaged']
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: Is your feature request related to a problem? Please describe
9+
description: A clear and concise description of what the problem is.
10+
placeholder: Ex. I'm always frustrated when [...]
11+
validations:
12+
required: true
13+
- type: textarea
14+
attributes:
15+
label: Describe the solution you'd like
16+
description: A clear and concise description of what you want to happen.
17+
validations:
18+
required: true
19+
- type: dropdown
20+
attributes:
21+
label: Related component
22+
description: Choose a specific OpenSearch component your feature request belongs to. If you are unsure of which component to select or if the component is not present, select "Other".
23+
multiple: false
24+
options:
25+
- Other
26+
- Build
27+
- Clients
28+
- Cluster Manager
29+
- Extensions
30+
- Indexing:Performance
31+
- Indexing:Replication
32+
- Indexing
33+
- Libraries
34+
- Plugins
35+
- Search:Aggregations
36+
- Search:Performance
37+
- Search:Query Capabilities
38+
- Search:Query Insights
39+
- Search:Relevance
40+
- Search:Remote Search
41+
- Search:Resiliency
42+
- Search:Searchable Snapshots
43+
- Search
44+
- Storage:Durability
45+
- Storage:Performance
46+
- Storage:Remote
47+
- Storage:Snapshots
48+
- Storage
49+
validations:
50+
required: true
51+
- type: textarea
52+
attributes:
53+
label: Describe alternatives you've considered
54+
description: A clear and concise description of any alternative solutions or features you've considered.
55+
validations:
56+
required: false
57+
- type: textarea
58+
attributes:
59+
label: Additional context
60+
description: Add any other context or screenshots about the feature request here.
61+
validations:
62+
required: false

‎.github/workflows/add-untriaged.yml

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

‎.github/workflows/triage.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Auto triage based on the component label in issue
2+
3+
on:
4+
issues:
5+
types: [opened, reopened, transferred]
6+
7+
jobs:
8+
apply-label:
9+
if: github.repository == 'opensearch-project/OpenSearch'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/github-script@v7
13+
with:
14+
script: |
15+
const { issue, repository } = context.payload;
16+
const { number, body } = issue;
17+
const { owner, name } = repository;
18+
const regex = /###\sRelated\scomponent\n\n(\w.*)\n/gm;
19+
let match;
20+
while ( ( match = regex.exec( body ) ) ) {
21+
const [ , component_label ] = match;
22+
await github.rest.issues.addLabels( {
23+
owner: owner.login,
24+
repo: name,
25+
issue_number: number,
26+
labels: [ `${ component_label }` ],
27+
} );
28+
}
29+
github.rest.issues.addLabels({
30+
issue_number: context.issue.number,
31+
owner: context.repo.owner,
32+
repo: context.repo.repo,
33+
labels: ['untriaged']
34+
})

‎release-notes/opensearch.release-notes-1.3.14.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
## 2023-12-12 Version 1.3.14 Release Notes
2+
3+
### Upgrades
4+
- Bump asm from 9.5 to 9.6 ([#10302](https://github.com/opensearch-project/OpenSearch/pull/10302))
5+
- Bump netty from 4.1.97.Final to 4.1.99.Final ([#10303](https://github.com/opensearch-project/OpenSearch/pull/10303))
6+
- Bump `netty` from 4.1.99.Final to 4.1.100.Final ([#10564](https://github.com/opensearch-project/OpenSearch/pull/10564))
7+
- Bump `netty` from 4.1.100.Final to 4.1.101.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294))
8+
- Bump `org.apache.zookeeper:zookeper` from 3.8.0 to 3.8.3 ([#11476](https://github.com/opensearch-project/OpenSearch/pull/11476))
9+
- Bump `org.bouncycastle:bc-fips` from 1.0.2.3 to 1.0.2.4 ([#10297](https://github.com/opensearch-project/OpenSearch/pull/10297))
10+
- Bump `org.apache.avro:avro` from 1.10.2 to 1.11.3 ([#11502](https://github.com/opensearch-project/OpenSearch/pull/11502))
11+
- Bump `jetty` from 9.4.51.v20230217 to 9.4.52.v20230823 ([#11501](https://github.com/opensearch-project/OpenSearch/pull/11501))
12+
- Bump `io.projectreactor:reactor-core` from 3.4.23 to 3.4.34 and reactor-netty from 1.0.24 to 1.0.39 ([#11500](https://github.com/opensearch-project/OpenSearch/pull/11500))
13+
- Bump `logback-core` and `logback-classic` to 1.2.13 ([#11521](https://github.com/opensearch-project/OpenSearch/pull/11521))
14+
- Bumps `jetty` version from 9.4.52.v20230823 to 9.4.53.v20231009 ([#11539](https://github.com/opensearch-project/OpenSearch/pull/11539))
15+
16+
### Bug Fixes
17+
- Use iterative approach to evaluate Regex.simpleMatch ([#11060](https://github.com/opensearch-project/OpenSearch/pull/11060))
18+
- Improve compressed request handling ([#10261](https://github.com/opensearch-project/OpenSearch/pull/10261))

‎server/src/main/java/org/opensearch/search/internal/SearchContext.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.apache.lucene.search.CollectorManager;
3636
import org.apache.lucene.search.FieldDoc;
3737
import org.apache.lucene.search.Query;
38-
import org.apache.lucene.util.ArrayUtil;
3938
import org.opensearch.action.search.SearchShardTask;
4039
import org.opensearch.action.search.SearchType;
4140
import org.opensearch.common.Nullable;
@@ -87,6 +86,8 @@
8786
import java.util.concurrent.CopyOnWriteArrayList;
8887
import java.util.concurrent.atomic.AtomicBoolean;
8988

89+
import static org.opensearch.search.aggregations.bucket.BucketUtils.suggestShardSideQueueSize;
90+
9091
/**
9192
* This class encapsulates the state needed to execute a search. It holds a reference to the
9293
* shards point in time snapshot (IndexReader / ContextIndexSearcher) and allows passing on
@@ -410,7 +411,7 @@ public boolean shouldUseConcurrentSearch() {
410411
*/
411412
public LocalBucketCountThresholds asLocalBucketCountThresholds(TermsAggregator.BucketCountThresholds bucketCountThresholds) {
412413
if (shouldUseConcurrentSearch()) {
413-
return new LocalBucketCountThresholds(0, ArrayUtil.MAX_ARRAY_LENGTH - 1);
414+
return new LocalBucketCountThresholds(0, suggestShardSideQueueSize(bucketCountThresholds.getShardSize()));
414415
} else {
415416
return new LocalBucketCountThresholds(bucketCountThresholds.getShardMinDocCount(), bucketCountThresholds.getShardSize());
416417
}

‎server/src/test/java/org/opensearch/index/shard/IndexShardTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1416,7 +1416,7 @@ public void testRestoreLocalHistoryFromTranslogOnPromotion() throws IOException,
14161416
indexShard,
14171417
indexShard.getPendingPrimaryTerm() + 1,
14181418
globalCheckpoint,
1419-
randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, maxSeqNo),
1419+
randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, maxSeqNoOfUpdatesOrDeletesBeforeRollback),
14201420
new ActionListener<Releasable>() {
14211421
@Override
14221422
public void onResponse(Releasable releasable) {

0 commit comments

Comments
 (0)