(incubator-uniffle) branch master updated: [#1472][part-3] fix(client): Fix occasional IllegalReferenceCountException issues in extremely rare scenarios (#1522)

[roryqi]

This is an automated email from the ASF dual-hosted git repository.

roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new bc60c1290 [#1472][part-3] fix(client): Fix occasional 
IllegalReferenceCountException issues in extremely rare scenarios (#1522)
bc60c1290 is described below

commit bc60c129022b8ee88cf39d9b0e93bf7aa61d40d7
Author: RickyMa <rick...@tencent.com>
AuthorDate: Thu Feb 15 11:57:57 2024 +0800

    [#1472][part-3] fix(client): Fix occasional IllegalReferenceCountException 
issues in extremely rare scenarios (#1522)
    
    ### What changes were proposed in this pull request?
    
    Improve the robustness of methods `ShuffleDataResult.release()` and 
`ShuffleIndexResult.release()` to fix occasional IllegalReferenceCountException 
issues in extremely rare scenarios.
    
    ### Why are the changes needed?
    
    A sub PR for: https://github.com/apache/incubator-uniffle/pull/1519
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Existing UTs.
---
 .../java/org/apache/uniffle/common/netty/TransportFrameDecoder.java    | 3 ++-
 .../org/apache/uniffle/common/netty/buffer/NettyManagedBuffer.java     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/common/src/main/java/org/apache/uniffle/common/netty/TransportFrameDecoder.java
 
b/common/src/main/java/org/apache/uniffle/common/netty/TransportFrameDecoder.java
index cfb0c40ae..deab9fe4c 100644
--- 
a/common/src/main/java/org/apache/uniffle/common/netty/TransportFrameDecoder.java
+++ 
b/common/src/main/java/org/apache/uniffle/common/netty/TransportFrameDecoder.java
@@ -22,6 +22,7 @@ import java.util.LinkedList;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.EmptyByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -84,7 +85,7 @@ public class TransportFrameDecoder extends 
ChannelInboundHandlerAdapter implemen
     if (msg == null || msg.body() == null || msg.body().byteBuf() == null) {
       return true;
     }
-    return msg.body().byteBuf().readableBytes() == 0;
+    return msg.body().byteBuf() instanceof EmptyByteBuf;
   }
 
   private void clear() {
diff --git 
a/common/src/main/java/org/apache/uniffle/common/netty/buffer/NettyManagedBuffer.java
 
b/common/src/main/java/org/apache/uniffle/common/netty/buffer/NettyManagedBuffer.java
index 53286429d..547a4e891 100644
--- 
a/common/src/main/java/org/apache/uniffle/common/netty/buffer/NettyManagedBuffer.java
+++ 
b/common/src/main/java/org/apache/uniffle/common/netty/buffer/NettyManagedBuffer.java
@@ -25,7 +25,7 @@ import io.netty.buffer.Unpooled;
 public class NettyManagedBuffer extends ManagedBuffer {
 
   public static final NettyManagedBuffer EMPTY_BUFFER =
-      new NettyManagedBuffer(Unpooled.buffer(0, 0));
+      new NettyManagedBuffer(Unpooled.EMPTY_BUFFER);
 
   private ByteBuf buf;