From f33e14ad4a29fb29fb3b1ab79a46c2be5d2a6680 Mon Sep 17 00:00:00 2001
From: shfshihuafeng <shfshihuafeng@163.com>
Date: Wed, 1 May 2024 22:49:30 +0800
Subject: [PATCH] DRILL-8489: Sender memory leak when rpc encode exception
 (#2901)

---
 .../main/java/org/apache/drill/exec/rpc/RpcEncoder.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java
index 89466302ba2..007be0c826e 100644
--- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java
+++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java
@@ -61,7 +61,7 @@ protected void encode(ChannelHandlerContext ctx, OutboundRpcMessage msg, List<Ob
       msg.release();
       return;
     }
-
+    boolean encodeSucess = false;
     try{
       if (RpcConstants.EXTRA_DEBUGGING) {
         logger.debug("Encoding outbound message {}", msg);
@@ -131,9 +131,13 @@ protected void encode(ChannelHandlerContext ctx, OutboundRpcMessage msg, List<Ob
       if (RpcConstants.EXTRA_DEBUGGING) {
         logger.debug("Sent message.  Ending writer index was {}.", buf.writerIndex());
       }
+      encodeSucess = true;
     } finally {
       // make sure to release Rpc Messages underlying byte buffers.
-      //msg.release();
+      //if msg instanceof ReferenceCounted,netty can release msg.
+      if (!encodeSucess) {
+        msg.release();
+      }
     }
   }