Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Try to fix Netty leak with explicit read. #1638

Closed
wants to merge 1 commit into from
+7 −8
Closed

chore: Try to fix Netty leak with explicit read. #1638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import org.apache.pekko
import pekko.PekkoException
import pekko.util.unused

import io.netty.buffer.ByteBuf
import io.netty.channel.{ ChannelHandlerContext, SimpleChannelInboundHandler }

/**
Expand All @@ -36,7 +35,7 @@ private[netty] trait NettyHelpers {

protected def onOpen(@unused ctx: ChannelHandlerContext): Unit = ()

protected def onMessage(@unused ctx: ChannelHandlerContext, @unused msg: ByteBuf): Unit = ()
protected def onMessage(@unused ctx: ChannelHandlerContext, @unused msg: Array[Byte]): Unit = ()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there anything special about ByteBuf ? (;I don't know about Netty

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is just a Try, and will not be needed. the old code is actually right.


protected def onException(@unused ctx: ChannelHandlerContext, @unused e: Throwable): Unit = ()

Expand All @@ -53,9 +52,9 @@ private[netty] trait NettyHelpers {
/**
* INTERNAL API
*/
private[netty] abstract class NettyChannelHandlerAdapter extends SimpleChannelInboundHandler[ByteBuf]
private[netty] abstract class NettyChannelHandlerAdapter extends SimpleChannelInboundHandler[Array[Byte]]
with NettyHelpers {
final override def channelRead0(ctx: ChannelHandlerContext, msg: ByteBuf): Unit = {
final override def channelRead0(ctx: ChannelHandlerContext, msg: Array[Byte]): Unit = {
onMessage(ctx, msg)
}

Expand Down
3 changes: 2 additions & 1 deletion remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import io.netty.channel.group.{ ChannelGroup, ChannelGroupFuture, ChannelMatcher
import io.netty.channel.nio.NioEventLoopGroup
import io.netty.channel.socket.SocketChannel
import io.netty.channel.socket.nio.{ NioServerSocketChannel, NioSocketChannel }
import io.netty.handler.codec.bytes.ByteArrayDecoder
import io.netty.handler.codec.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender }
import io.netty.handler.flush.FlushConsolidationHandler
import io.netty.handler.ssl.SslHandler
Expand Down Expand Up @@ -381,7 +382,7 @@ class NettyTransport(val settings: NettyTransportSettings, val system: ExtendedA
FrameLengthFieldLength, // Strip the header
true))
pipeline.addLast("FrameEncoder", new LengthFieldPrepender(FrameLengthFieldLength))

pipeline.addLast("bytesDecoder", new ByteArrayDecoder)
pipeline
}

Expand Down
5 changes: 2 additions & 3 deletions remote/src/main/scala/org/apache/pekko/remote/transport/netty/TcpSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import pekko.remote.transport.AssociationHandle.{ Disassociated, HandleEvent, Ha
import pekko.remote.transport.Transport.AssociationEventListener
import pekko.util.ByteString

import io.netty.buffer.{ ByteBuf, ByteBufUtil, Unpooled }
import io.netty.buffer.Unpooled
import io.netty.channel.{ Channel, ChannelHandlerContext }
import io.netty.util.AttributeKey

Expand Down Expand Up @@ -55,8 +55,7 @@ private[remote] trait TcpHandlers extends CommonHandlers {
log.debug("Remote connection to [{}] was disconnected.", ctx.channel().remoteAddress())
}

override def onMessage(ctx: ChannelHandlerContext, msg: ByteBuf): Unit = {
val bytes: Array[Byte] = ByteBufUtil.getBytes(msg)
override def onMessage(ctx: ChannelHandlerContext, bytes: Array[Byte]): Unit = {
if (bytes.length > 0) notifyListener(ctx.channel(), InboundPayload(ByteString(bytes)))
}

Expand Down
Loading