You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by ni...@apache.org on 2022/11/29 07:15:06 UTC

[bookkeeper] branch branch-4.15 updated (25c6211b1a -> 6b37505e35)

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

nicoloboschi pushed a change to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


    from 25c6211b1a Bump branch-4.15 version to next development version (#3641)
     new 1faaaf2ad4 InterleavedLedgerStorage: safe release ByteBuf (#3674)
     new 6b37505e35 [refactor][bookkeeper] Refactor ByteBuf release method in DefaultEntryLogger (#3673)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/bookkeeper/bookie/EntryLogger.java   | 11 ++++++-----
 .../apache/bookkeeper/bookie/InterleavedLedgerStorage.java    |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)


[bookkeeper] 02/02: [refactor][bookkeeper] Refactor ByteBuf release method in DefaultEntryLogger (#3673)

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nicoloboschi pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git

commit 6b37505e35898a4fee35ad320ea44d02374203bd
Author: Qiang Huang <qi...@gmail.com>
AuthorDate: Tue Nov 29 15:07:12 2022 +0800

    [refactor][bookkeeper] Refactor ByteBuf release method in DefaultEntryLogger (#3673)
    
    (cherry picked from commit 8fce024989ea0427877cb8981fcb94f7afadc3c7)
    (cherry picked from commit c334fa34ca3bcea4cdece6c098379f10b18d6d29)
---
 .../main/java/org/apache/bookkeeper/bookie/EntryLogger.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
index d69e434ef5..396410d14e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
@@ -32,6 +32,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
+import io.netty.util.ReferenceCountUtil;
 import io.netty.util.concurrent.FastThreadLocal;
 import java.io.BufferedReader;
 import java.io.File;
@@ -188,7 +189,7 @@ public class EntryLogger {
                     throw e;
                 }
             } finally {
-                serializedMap.release();
+                ReferenceCountUtil.safeRelease(serializedMap);
             }
             // Flush the ledger's map out before we write the header.
             // Otherwise the header might point to something that is not fully
@@ -857,7 +858,7 @@ public class EntryLogger {
         ByteBuf data = allocator.buffer(entrySize, entrySize);
         int rc = readFromLogChannel(entryLogId, fc, data, pos);
         if (rc != entrySize) {
-            data.release();
+            ReferenceCountUtil.safeRelease(data);
             throw new IOException("Bad entry read from log file id: " + entryLogId,
                     new EntryLookupException("Short read for " + ledgerId + "@"
                                               + entryId + " in " + entryLogId + "@"
@@ -895,7 +896,7 @@ public class EntryLogger {
             int ledgersCount = headers.readInt();
             return new Header(headerVersion, ledgersMapOffset, ledgersCount);
         } finally {
-            headers.release();
+            ReferenceCountUtil.safeRelease(headers);
         }
     }
 
@@ -1041,7 +1042,7 @@ public class EntryLogger {
                 pos += entrySize;
             }
         } finally {
-            data.release();
+            ReferenceCountUtil.safeRelease(data);
         }
     }
 
@@ -1144,7 +1145,7 @@ public class EntryLogger {
         } catch (IndexOutOfBoundsException e) {
             throw new IOException(e);
         } finally {
-            ledgersMap.release();
+            ReferenceCountUtil.safeRelease(ledgersMap);
         }
 
         if (meta.getLedgersMap().size() != header.ledgersCount) {


[bookkeeper] 01/02: InterleavedLedgerStorage: safe release ByteBuf (#3674)

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nicoloboschi pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git

commit 1faaaf2ad4447859677205f49fbf5321e879f774
Author: StevenLuMT <ls...@126.com>
AuthorDate: Tue Nov 29 15:05:18 2022 +0800

    InterleavedLedgerStorage: safe release ByteBuf (#3674)
    
    Co-authored-by: lushiji <lu...@didiglobal.com>
    (cherry picked from commit 25f03a046b65b1f3db61bf8d23b5611fea3f33fb)
    (cherry picked from commit 746799602f194b1fc6f6b7c16cc860a23578ce95)
---
 .../java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
index a1dc14b2f6..ff79b7234f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
@@ -37,7 +37,7 @@ import com.google.common.util.concurrent.RateLimiter;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-
+import io.netty.util.ReferenceCountUtil;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -348,7 +348,7 @@ public class InterleavedLedgerStorage implements CompactableLedgerStorage, Entry
                     lac = bb.readLong();
                     lac = ledgerCache.updateLastAddConfirmed(ledgerId, lac);
                 } finally {
-                    bb.release();
+                    ReferenceCountUtil.safeRelease(bb);
                 }
             }
         }