Skip to content

Commit

Permalink
Merge branch 'opensearch-project:main' into main-repository-gcs-ADC-S…
Browse files Browse the repository at this point in the history
…upport
  • Loading branch information
fahadshamiinsta authored Oct 3, 2023
2 parents 42a83ed + 3a790c1 commit 73d742f
Show file tree
Hide file tree
Showing 186 changed files with 2,664 additions and 975 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Implement on behalf of token passing for extensions ([#8679](https://github.com/opensearch-project/OpenSearch/pull/8679))
- Implement Visitor Design pattern in QueryBuilder to enable the capability to traverse through the complex QueryBuilder tree. ([#10110](https://github.com/opensearch-project/OpenSearch/pull/10110))
- Provide service accounts tokens to extensions ([#9618](https://github.com/opensearch-project/OpenSearch/pull/9618))
- Configurable merge policy for index with an option to choose from LogByteSize and Tiered merge policy ([#9992](https://github.com/opensearch-project/OpenSearch/pull/9992))

### Dependencies
- Bump `log4j-core` from 2.18.0 to 2.19.0
Expand Down Expand Up @@ -88,6 +89,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- [Telemetry-Otel] Added support for OtlpGrpcSpanExporter exporter ([#9666](https://github.com/opensearch-project/OpenSearch/pull/9666))
- Async blob read support for encrypted containers ([#10131](https://github.com/opensearch-project/OpenSearch/pull/10131))
- Add capability to restrict async durability mode for remote indexes ([#10189](https://github.com/opensearch-project/OpenSearch/pull/10189))
- Add Doc Status Counter for Indexing Engine ([#4562](https://github.com/opensearch-project/OpenSearch/issues/4562))

### Dependencies
- Bump `peter-evans/create-or-update-comment` from 2 to 3 ([#9575](https://github.com/opensearch-project/OpenSearch/pull/9575))
Expand All @@ -104,7 +106,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `org.xerial.snappy:snappy-java` from 1.1.10.3 to 1.1.10.4 ([#10206](https://github.com/opensearch-project/OpenSearch/pull/10206))
- Bump `com.google.api.grpc:proto-google-common-protos` from 2.10.0 to 2.25.0 ([#10208](https://github.com/opensearch-project/OpenSearch/pull/10208))
- Bump `codecov/codecov-action` from 2 to 3 ([#10209](https://github.com/opensearch-project/OpenSearch/pull/10209))
- Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))`
- Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([#10219](https://github.com/opensearch-project/OpenSearch/pull/10219))`
- Bump `org.bouncycastle:bcprov-jdk15to18` from 1.75 to 1.76 ([#10219](https://github.com/opensearch-project/OpenSearch/pull/10219))`
- Bump `org.bouncycastle:bcmail-jdk15to18` from 1.75 to 1.76 ([#10219](https://github.com/opensearch-project/OpenSearch/pull/10219))`
- Bump Lucene from 9.7.0 to 9.8.0 ([#10276](https://github.com/opensearch-project/OpenSearch/pull/10276))
- Bump asm from 9.5 to 9.6 ([#10302](https://github.com/opensearch-project/OpenSearch/pull/10302))
- Bump netty from 4.1.97.Final to 4.1.99.Final ([#10303](https://github.com/opensearch-project/OpenSearch/pull/10303))

### Changed
- Add instrumentation in rest and network layer. ([#9415](https://github.com/opensearch-project/OpenSearch/pull/9415))
Expand All @@ -113,16 +120,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Force merge with `only_expunge_deletes` honors max segment size ([#10036](https://github.com/opensearch-project/OpenSearch/pull/10036))
- Add instrumentation in transport service. ([#10042](https://github.com/opensearch-project/OpenSearch/pull/10042))
- [Tracing Framework] Add support for SpanKind. ([#10122](https://github.com/opensearch-project/OpenSearch/pull/10122))
- Pass parent filter to inner query in nested query ([#10246](https://github.com/opensearch-project/OpenSearch/pull/10246))
- Disable concurrent segment search when terminate_after is used ([#10200](https://github.com/opensearch-project/OpenSearch/pull/10200))

### Deprecated

### Removed
- Remove spurious SGID bit on directories ([#9447](https://github.com/opensearch-project/OpenSearch/pull/9447))

### Fixed
- Fix ignore_missing parameter has no effect when using template snippet in rename ingest processor ([#9725](https://github.com/opensearch-project/OpenSearch/pull/9725))
- Fix broken backward compatibility from 2.7 for IndexSorted field indices ([#10045](https://github.com/opensearch-project/OpenSearch/pull/10045))
- Fix concurrent search NPE when track_total_hits, terminate_after and size=0 are used ([#10082](https://github.com/opensearch-project/OpenSearch/pull/10082))
- Fix remove ingest processor handing ignore_missing parameter not correctly ([10089](https://github.com/opensearch-project/OpenSearch/pull/10089))
- Fix circular dependency in Settings initialization ([10194](https://github.com/opensearch-project/OpenSearch/pull/10194))
- Fix registration and initialization of multiple extensions ([10256](https://github.com/opensearch-project/OpenSearch/pull/10256))

### Security

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.8.0-snapshot-95cdd2e
lucene = 9.8.0

bundled_jdk_vendor = adoptium
bundled_jdk = 20.0.2+9
Expand All @@ -16,7 +16,7 @@ icu4j = 70.1
supercsv = 2.4.0
log4j = 2.20.0
slf4j = 1.7.36
asm = 9.5
asm = 9.6
jettison = 1.5.4
woodstox = 6.4.0
kotlin = 1.7.10
Expand All @@ -28,7 +28,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.97.Final
netty = 4.1.99.Final
joda = 2.12.2

# client dependencies
Expand Down
8 changes: 4 additions & 4 deletions distribution/packages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
configurationFile '/etc/opensearch/jvm.options'
configurationFile '/etc/opensearch/log4j2.properties'
from("${packagingFiles}") {
dirMode 02750
dirMode 0750
into('/etc')
permissionGroup 'opensearch'
includeEmptyDirs true
Expand All @@ -223,7 +223,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
}
from("${packagingFiles}/etc/opensearch") {
into('/etc/opensearch')
dirMode 02750
dirMode 0750
fileMode 0660
permissionGroup 'opensearch'
includeEmptyDirs true
Expand Down Expand Up @@ -281,8 +281,8 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
dirMode mode
}
}
copyEmptyDir('/var/log/opensearch', 'opensearch', 'opensearch', 02750)
copyEmptyDir('/var/lib/opensearch', 'opensearch', 'opensearch', 02750)
copyEmptyDir('/var/log/opensearch', 'opensearch', 'opensearch', 0750)
copyEmptyDir('/var/lib/opensearch', 'opensearch', 'opensearch', 0750)
copyEmptyDir('/usr/share/opensearch/plugins', 'root', 'root', 0755)

into '/usr/share/opensearch'
Expand Down
8 changes: 4 additions & 4 deletions distribution/packages/src/deb/lintian/opensearch
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ missing-dep-on-jarwrapper

# we prefer to not make our config and log files world readable
non-standard-file-perm etc/default/opensearch 0660 != 0644
non-standard-dir-perm etc/opensearch/ 2750 != 0755
non-standard-dir-perm etc/opensearch/jvm.options.d/ 2750 != 0755
non-standard-dir-perm etc/opensearch/ 0750 != 0755
non-standard-dir-perm etc/opensearch/jvm.options.d/ 0750 != 0755
non-standard-file-perm etc/opensearch/*
non-standard-dir-perm var/lib/opensearch/ 2750 != 0755
non-standard-dir-perm var/log/opensearch/ 2750 != 0755
non-standard-dir-perm var/lib/opensearch/ 0750 != 0755
non-standard-dir-perm var/log/opensearch/ 0750 != 0755
executable-is-not-world-readable etc/init.d/opensearch 0750
non-standard-file-permissions-for-etc-init.d-script etc/init.d/opensearch 0750 != 0755

Expand Down

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-9.8.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e8421c5f8573bcf22e9265fc7e19469545a775a
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,15 @@ public int getStatus() {
return status;
}

/**
* Get category class of a rest status code.
*
* @return Integer representing class category of the concrete rest status code
*/
public int getStatusFamilyCode() {
return status / 100;
}

public static RestStatus readFrom(StreamInput in) throws IOException {
return RestStatus.valueOf(in.readString());
}
Expand Down
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/asm-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/asm-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aa205cf0a06dbd8e04ece91c0b37c3f5d567546a
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/asm-commons-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/asm-commons-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1a9e5508eff490744144565c47326c8648be309
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/asm-tree-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/asm-tree-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c0cdda9d211e965d2a4448aa3fd86110f2f8c2de

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7725476acfcb9bdfeff1b813ce15c39c6b857dc2
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aa205cf0a06dbd8e04ece91c0b37c3f5d567546a
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-analysis-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9ce6c7b174bd997fc2552dff47964546bd7a5ec3
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-commons-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-commons-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1a9e5508eff490744144565c47326c8648be309
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-tree-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-tree-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c0cdda9d211e965d2a4448aa3fd86110f2f8c2de
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/asm-util-9.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/asm-util-9.6.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f77caf84eb93786a749b2baa40865b9613e3eaee

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

0 comments on commit 73d742f

Please sign in to comment.