Skip to content

Commit

Permalink
Merge branch 'opensearch-project:main' into fix-chunk_size-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Rishikesh1159 authored Feb 22, 2024
2 parents 7806639 + f8225ca commit 04b75fd
Show file tree
Hide file tree
Showing 219 changed files with 3,255 additions and 149 deletions.
1 change: 1 addition & 0 deletions .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ BWC_VERSION:
- "2.11.1"
- "2.11.2"
- "2.12.0"
- "2.12.1"
- "2.13.0"
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Verify Description Checklist
runs-on: ubuntu-latest
steps:
- uses: peternied/check-pull-request-description-checklist@v1
- uses: peternied/check-pull-request-description-checklist@v1.1
with:
checklist-items: |
New functionality includes testing.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/wrapper-validation-action@v2
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Allow to pass the list settings through environment variables (like [], ["a", "b", "c"], ...) ([#10625](https://github.com/opensearch-project/OpenSearch/pull/10625))
- [Admission Control] Integrate CPU AC with ResourceUsageCollector and add CPU AC stats to nodes/stats ([#10887](https://github.com/opensearch-project/OpenSearch/pull/10887))
- [S3 Repository] Add setting to control connection count for sync client ([#12028](https://github.com/opensearch-project/OpenSearch/pull/12028))
- Views, simplify data access and manipulation by providing a virtual layer over one or more indices ([#11957](https://github.com/opensearch-project/OpenSearch/pull/11957))
- Add Remote Store Migration Experimental flag and allow mixed mode clusters under same ([#11986](https://github.com/opensearch-project/OpenSearch/pull/11986))

### Dependencies
Expand Down Expand Up @@ -106,6 +107,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `peter-evans/find-comment` from 2 to 3 ([#12288](https://github.com/opensearch-project/OpenSearch/pull/12288))
- Bump `com.google.api.grpc:proto-google-common-protos` from 2.25.1 to 2.33.0 ([#12289](https://github.com/opensearch-project/OpenSearch/pull/12289))
- Bump `com.squareup.okio:okio` from 3.7.0 to 3.8.0 ([#12290](https://github.com/opensearch-project/OpenSearch/pull/12290))
- Bump `gradle/wrapper-validation-action` from 1 to 2 ([#12367](https://github.com/opensearch-project/OpenSearch/pull/12367))
- Bump `netty` from 4.1.106.Final to 4.1.107.Final ([#12372](https://github.com/opensearch-project/OpenSearch/pull/12372))
- Bump `opentelemetry` from 1.34.1 to 1.35.0 ([#12388](https://github.com/opensearch-project/OpenSearch/pull/12388))
- Bump Apache Lucene from 9.9.2 to 9.10.0 ([#12392](https://github.com/opensearch-project/OpenSearch/pull/12392))

### Changed
- Allow composite aggregation to run under a parent filter aggregation ([#11499](https://github.com/opensearch-project/OpenSearch/pull/11499))
Expand All @@ -121,6 +126,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add a system property to configure YamlParser codepoint limits ([#12298](https://github.com/opensearch-project/OpenSearch/pull/12298))
- Prevent read beyond slice boundary in ByteArrayIndexInput ([#10481](https://github.com/opensearch-project/OpenSearch/issues/10481))
- Fix the "highlight.max_analyzer_offset" request parameter with "plain" highlighter ([#10919](https://github.com/opensearch-project/OpenSearch/pull/10919))
- Warn about deprecated and ignored index.mapper.dynamic index setting ([#11193](https://github.com/opensearch-project/OpenSearch/pull/11193))

### Security

Expand Down
2 changes: 1 addition & 1 deletion TRIAGING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Yes, there are several labels that are used to identify the 'state' of issues fi
| Outcome | Label | Description | Canned Response |
|--------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Accepted | `-untriaged` | The issue has the details needed to be directed towards area owners. | "Thanks for filing this issue, please feel free to submit a pull request." |
| Rejected | N/A | The issue will be closed with a reason for why it was rejected. Reasons might include lack of details, or being outside the scope of the project. | "Thanks for creating this issue; however, it isn't being accepted due to {REASON}. Please feel free to re-open after addressing the reason." |
| Rejected | N/A | The issue will be closed with a reason for why it was rejected. Reasons might include lack of details, or being outside the scope of the project. | "Thanks for creating this issue; however, it isn't being accepted due to {REASON}. Please feel free to open a new issue after addressing the reason." |
| Area Triage | `+{AREALABEL}` | OpenSearch has many different areas. If it's unclear whether an issue should be accepted, it will be labeled with the area and an owner will be @mentioned for follow-up. | "Thanks for creating this issue; the triage meeting was unsure if this issue should be accepted, @{PERSON} or someone from the area please review and then accept or reject this issue?" |
| Transfer | N/A | If the issue applies to another repository within the OpenSearch Project, it will be transferred accordingly. | "@opensearch-project/triage, can you please transfer this issue to project {REPOSITORY}." Or, if someone at the meeting has permissions, they can start the transfer. |

Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,6 @@ subprojects {
includeClasses.add("org.opensearch.remotestore.CreateRemoteIndexClusterDefaultDocRep")
includeClasses.add("org.opensearch.remotestore.CreateRemoteIndexIT")
includeClasses.add("org.opensearch.remotestore.CreateRemoteIndexTranslogDisabledIT")
includeClasses.add("org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT")
includeClasses.add("org.opensearch.remotestore.RemoteStoreBackpressureIT")
includeClasses.add("org.opensearch.remotestore.RemoteStoreIT")
includeClasses.add("org.opensearch.remotestore.RemoteStoreRefreshListenerIT")
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opensearch = 3.0.0
lucene = 9.9.2
lucene = 9.10.0

bundled_jdk_vendor = adoptium
bundled_jdk = 21.0.2+13
Expand All @@ -26,7 +26,7 @@ jakarta_annotation = 1.3.5
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.13.0

netty = 4.1.106.Final
netty = 4.1.107.Final
joda = 2.12.2

# project reactor
Expand Down Expand Up @@ -70,5 +70,5 @@ jzlib = 1.1.3
resteasy = 6.2.4.Final

# opentelemetry dependencies
opentelemetry = 1.34.1
opentelemetry = 1.35.0
opentelemetrysemconv = 1.23.1-alpha
1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
64e5624754d59386be5d9159c68f81ff96298704
1 change: 0 additions & 1 deletion libs/core/licenses/lucene-core-9.9.2.jar.sha1

This file was deleted.

5 changes: 3 additions & 2 deletions libs/core/src/main/java/org/opensearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_2_11_1 = new Version(2110199, org.apache.lucene.util.Version.LUCENE_9_7_0);
public static final Version V_2_11_2 = new Version(2110299, org.apache.lucene.util.Version.LUCENE_9_7_0);
public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_9_2);
public static final Version V_2_13_0 = new Version(2130099, org.apache.lucene.util.Version.LUCENE_9_9_2);
public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_9_2);
public static final Version V_2_12_1 = new Version(2120199, org.apache.lucene.util.Version.LUCENE_9_9_2);
public static final Version V_2_13_0 = new Version(2130099, org.apache.lucene.util.Version.LUCENE_9_10_0);
public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_10_0);
public static final Version CURRENT = V_3_0_0;

public static Version fromId(int id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public class XContentParserTests extends OpenSearchTestCase {
() -> randomAlphaOfLengthBetween(1, SmileXContent.DEFAULT_MAX_STRING_LEN),
/* YAML parser limitation */
XContentType.YAML,
() -> randomRealisticUnicodeOfCodepointLengthBetween(1, YamlXContent.DEFAULT_CODEPOINT_LIMIT)
/* use 75% of the limit, difficult to get the exact size of the content right */
() -> randomRealisticUnicodeOfCodepointLengthBetween(1, (int) (YamlXContent.DEFAULT_CODEPOINT_LIMIT * 0.75))
);

private static final Map<XContentType, Supplier<String>> OFF_LIMIT_GENERATORS = Map.of(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e2daf2e568fe120e84567505f7c85643bb0b9dd2

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8509a72b8a5a2d33d611e99254aed39765c3ad82

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a1d32debf2ed07c5852ab5b2904c43adb76c39e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
04d8e9e51b7254bd26a42fe17bdcae32e4c6ebb3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3885ffe7dd05c9773df70c61009f34a5a8a383ec

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f17a547530d64becd7179507b25f4154bcfba57

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4c6b05f4d9aca117981297fb7f02953102ebb5e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dfee84308341a42131dd0f8ac0e1e02d627c19f3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6a105c621b47d1410e0e09419d7209d2d46e914

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d61d4959741109b3eccd7337f11fc89fa90a74a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed54097d13dbaae6e758c31f55a473ba6566ae8d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a158d8a7d386c782a10ec15827ff3f0aa6fd8291

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
79eb4c5e1c92b613341d05173dfcdce182fa5f80

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b6ba8f0ecee48b94911c08ee12c20f059ec38ec5

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ccf4512816ba9cd5c2cca9182db78a2e48e7e16f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b596817e70f00bc54d66e82c118f47ca91b9e401

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7acc74d35684269ffa74909395044e0e02581285

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
945e8ad5ab7ec4f11fb0257d2594af0cfae1d4b7

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3885ffe7dd05c9773df70c61009f34a5a8a383ec

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3b7070e9acfe262bb0bd936c4051116631796b3b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ebc495e9b2bc2c9ab60a264b40f62dc0671d9f6e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d655d09e972dee46f580dbcf41c0d1356aea9e1b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d61d4959741109b3eccd7337f11fc89fa90a74a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3019703b67413ef3d6150da1f49753f4010507ce

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8509a72b8a5a2d33d611e99254aed39765c3ad82

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a1d32debf2ed07c5852ab5b2904c43adb76c39e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
04d8e9e51b7254bd26a42fe17bdcae32e4c6ebb3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3885ffe7dd05c9773df70c61009f34a5a8a383ec

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f17a547530d64becd7179507b25f4154bcfba57

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4c6b05f4d9aca117981297fb7f02953102ebb5e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dfee84308341a42131dd0f8ac0e1e02d627c19f3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6a105c621b47d1410e0e09419d7209d2d46e914

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9234407d6a46745599735765c4d3755c7fc84162

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d61d4959741109b3eccd7337f11fc89fa90a74a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
388c49986bc20f3b4bea58470eb16decd230c2db

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6e2aa0e28c5069121cf11b2c93225942358f1423

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d0784bf59b74a2dc369551cc6d200e243ce8cca0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5f038bc2b9a1f415c8f74c4a35e0d92fae64c430

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1a7baebfbc6c569163bc74a5add9819cc411d582

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5506cb34a43fb733564a2aee47763d34cada9a7a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d5abbce20bf88dff97b9ec7104bf13d163042f30

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
72720d7880110d02aad6d69066cc0311c568f17d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
82fe6a227fb3148aae2e61978cf77f7005a66bca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5d2bc29d8f2ef2cf5a2239ac6990a2c89118456d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da2122051bd95d3a36bf34f72f1b0dd9b105fd1f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
97942849d51081e766a29646175b752bb79d7ce0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
861b6a3c43a15ca3782f1fa17b024b9afa4b3ea6
Loading

0 comments on commit 04b75fd

Please sign in to comment.