Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Dependencies
- Bump `org.apache.zookeeper:zookeeper` from 3.9.3 to 3.9.4 ([#19535](https://github.com/opensearch-project/OpenSearch/pull/19535))
- Bump `netty` to 4.2.4 ([#19178](https://github.com/opensearch-project/OpenSearch/pull/19178))

### Deprecated

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ public void execute(Task t) {
test.systemProperty("io.netty.noUnsafe", "true");
test.systemProperty("io.netty.noKeySetOptimization", "true");
test.systemProperty("io.netty.recycler.maxCapacityPerThread", "0");
// See please https://github.com/netty/netty/issues/15631
test.systemProperty("io.netty.allocator.type", "pooled");

test.testLogging(logging -> {
logging.setShowExceptions(true);
Expand Down
1 change: 0 additions & 1 deletion client/rest/licenses/reactor-core-3.7.5.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions client/rest/licenses/reactor-core-3.8.0-M7.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cbe5b8b1e86a46c59708458bb2b2a61e9088777b
3 changes: 3 additions & 0 deletions distribution/src/config/jvm.options
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@ ${error.file}
# prevent issues like "leaked" maps or performance degradation. A value of 1 effectively
# disables the shared Arena pooling and uses a confined Arena for each MMapDirectory
-Dorg.apache.lucene.store.MMapDirectory.sharedArenaMaxPermits=1

# See please https://github.com/netty/netty/issues/1563
-Dio.netty.allocator.type=pooled
11 changes: 8 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ json_smart = "2.5.2"
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = "5.16.0"

netty = "4.1.125.Final"
netty = "4.2.6.Final"
joda = "2.12.7"
roaringbitmap = "1.3.0"

# project reactor
reactor_netty = "1.2.9"
reactor = "3.7.5"
reactor_netty = "1.3.0-M7"
reactor = "3.8.0-M7"

# client dependencies
httpclient5 = "5.4.4"
Expand Down Expand Up @@ -141,9 +141,12 @@ lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", ver
lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" }
netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" }
netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" }
netty-codec-base = { group = "io.netty", name = "netty-codec-base", version.ref = "netty" }
netty-codec-compression = { group = "io.netty", name = "netty-codec-compression", version.ref = "netty" }
netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref = "netty" }
netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" }
netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" }
netty-codec-http3 = { group = "io.netty", name = "netty-codec-http3", version.ref = "netty" }
netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" }
netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" }
netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" }
Expand Down Expand Up @@ -188,7 +191,9 @@ lucene = [

netty = [
"netty-buffer",
"netty-codec-base",
"netty-codec",
"netty-codec-compression",
"netty-codec-dns",
"netty-codec-http",
"netty-codec-http2",
Expand Down
47 changes: 20 additions & 27 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ opensearchplugin {
dependencies {
// network stack
api "io.netty:netty-buffer:${versions.netty}"
api "io.netty:netty-codec-base:${versions.netty}"
api "io.netty:netty-codec-compression:${versions.netty}"
api "io.netty:netty-codec:${versions.netty}"
api "io.netty:netty-codec-http:${versions.netty}"
api "io.netty:netty-codec-http2:${versions.netty}"
Expand Down Expand Up @@ -158,34 +160,13 @@ thirdPartyAudit {
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',

// from io.netty.handler.ssl.JettyNpnSslEngine (netty)
'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',
'org.eclipse.jetty.npn.NextProtoNego$ServerProvider',
'org.eclipse.jetty.npn.NextProtoNego',

// from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty)
'org.jboss.marshalling.ByteInput',

// from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty)
'org.jboss.marshalling.ByteOutput',

// from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty)
'org.jboss.marshalling.Marshaller',

// from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty)
'org.jboss.marshalling.MarshallerFactory',
'org.jboss.marshalling.MarshallingConfiguration',
'org.jboss.marshalling.Unmarshaller',

// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
'org.slf4j.helpers.FormattingTuple',
'org.slf4j.helpers.MessageFormatter',
'org.slf4j.Logger',
'org.slf4j.LoggerFactory',
'org.slf4j.spi.LocationAwareLogger',

'com.google.protobuf.nano.CodedOutputByteBufferNano',
'com.google.protobuf.nano.MessageNano',
'com.ning.compress.BufferRecycler',
'com.ning.compress.lzf.ChunkDecoder',
'com.ning.compress.lzf.ChunkEncoder',
Expand All @@ -209,26 +190,38 @@ thirdPartyAudit {
'io.netty.internal.tcnative.SSL',
'io.netty.internal.tcnative.SSLSession',
'io.netty.internal.tcnative.SSLSessionCache',
'org.eclipse.jetty.alpn.ALPN$ClientProvider',
'org.eclipse.jetty.alpn.ALPN$ServerProvider',
'org.eclipse.jetty.alpn.ALPN',

'org.conscrypt.AllocatedBuffer',
'org.conscrypt.BufferAllocator',
'org.conscrypt.Conscrypt',
'org.conscrypt.HandshakeListener',

'reactor.blockhound.BlockHound$Builder',
'reactor.blockhound.integration.BlockHoundIntegration'
'reactor.blockhound.integration.BlockHoundIntegration',

'io.netty.pkitesting.CertificateBuilder',
'io.netty.pkitesting.CertificateBuilder$Algorithm',
'io.netty.pkitesting.X509Bundle'
)

ignoreViolations(
'io.netty.buffer.AbstractAllocatorEvent',
'io.netty.buffer.AbstractBufferEvent',
'io.netty.buffer.AbstractChunkEvent',
'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf',
'io.netty.buffer.AdaptivePoolingAllocator$Chunk',
'io.netty.buffer.AllocateBufferEvent',
'io.netty.buffer.AllocateChunkEvent',
'io.netty.buffer.FreeBufferEvent',
'io.netty.buffer.FreeChunkEvent',
'io.netty.buffer.PooledByteBufAllocator',
'io.netty.buffer.ReallocateBufferEvent',
'io.netty.buffer.ReturnChunkEvent',
'io.netty.util.internal.PlatformDependent0',
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d3c3d384843eb12f8d33d92efd0e4e0ec305cd23
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fd6ff9613696f99857daeca37d4cfed22b1eb69e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fadf334ce949ae99b96b4b9d95d59c30a5dc2614

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cacd60c080051c74b9487074cf89d28ec892d71c
49 changes: 21 additions & 28 deletions plugins/arrow-flight-rpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ dependencies {
api "org.apache.arrow:arrow-memory-netty-buffer-patch:${versions.arrow}"
api "io.netty:netty-buffer:${versions.netty}"
api "io.netty:netty-common:${versions.netty}"
api "io.netty:netty-codec-base:${versions.netty}"
api "io.netty:netty-codec-compression:${versions.netty}"
api "org.apache.arrow:arrow-vector:${versions.arrow}"
api "org.apache.arrow:arrow-format:${versions.arrow}"

Expand Down Expand Up @@ -185,27 +187,6 @@ tasks.named('thirdPartyAudit').configure {
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',

// from io.netty.handler.ssl.JettyNpnSslEngine (netty)
'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',
'org.eclipse.jetty.npn.NextProtoNego$ServerProvider',
'org.eclipse.jetty.npn.NextProtoNego',

// from io.netty.handler.codec.marshalling.ChannelBufferByteInput (netty)
'org.jboss.marshalling.ByteInput',

// from io.netty.handler.codec.marshalling.ChannelBufferByteOutput (netty)
'org.jboss.marshalling.ByteOutput',

// from io.netty.handler.codec.marshalling.CompatibleMarshallingEncoder (netty)
'org.jboss.marshalling.Marshaller',

// from io.netty.handler.codec.marshalling.ContextBoundUnmarshallerProvider (netty)
'org.jboss.marshalling.MarshallerFactory',
'org.jboss.marshalling.MarshallingConfiguration',
'org.jboss.marshalling.Unmarshaller',

'com.google.protobuf.nano.CodedOutputByteBufferNano',
'com.google.protobuf.nano.MessageNano',
'com.ning.compress.BufferRecycler',
'com.ning.compress.lzf.ChunkDecoder',
'com.ning.compress.lzf.ChunkEncoder',
Expand All @@ -219,18 +200,32 @@ tasks.named('thirdPartyAudit').configure {
'net.jpountz.lz4.LZ4FastDecompressor',
'net.jpountz.xxhash.XXHash32',
'net.jpountz.xxhash.XXHashFactory',
'org.eclipse.jetty.alpn.ALPN$ClientProvider',
'org.eclipse.jetty.alpn.ALPN$ServerProvider',
'org.eclipse.jetty.alpn.ALPN',

'org.conscrypt.AllocatedBuffer',
'org.conscrypt.BufferAllocator',
'org.conscrypt.Conscrypt',
'org.conscrypt.HandshakeListener',

'io.netty.pkitesting.CertificateBuilder',
'io.netty.pkitesting.CertificateBuilder$Algorithm',
'io.netty.pkitesting.X509Bundle',

'com.google.protobuf.util.Timestamps'
)
ignoreViolations(
'io.netty.buffer.AbstractAllocatorEvent',
'io.netty.buffer.AbstractBufferEvent',
'io.netty.buffer.AbstractChunkEvent',
'io.netty.buffer.AdaptivePoolingAllocator$AdaptiveByteBuf',
'io.netty.buffer.AdaptivePoolingAllocator$Chunk',
'io.netty.buffer.AllocateBufferEvent',
'io.netty.buffer.AllocateChunkEvent',
'io.netty.buffer.FreeBufferEvent',
'io.netty.buffer.FreeChunkEvent',
'io.netty.buffer.PooledByteBufAllocator',
'io.netty.buffer.ReallocateBufferEvent',
'io.netty.buffer.ReturnChunkEvent',

// Guava internal classes
'com.google.common.cache.Striped64',
'com.google.common.cache.Striped64$1',
Expand All @@ -250,8 +245,7 @@ tasks.named('thirdPartyAudit').configure {
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand All @@ -270,8 +264,7 @@ tasks.named('thirdPartyAudit').configure {
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d3c3d384843eb12f8d33d92efd0e4e0ec305cd23
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fd6ff9613696f99857daeca37d4cfed22b1eb69e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fadf334ce949ae99b96b4b9d95d59c30a5dc2614

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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