You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by ch...@apache.org on 2022/12/08 14:38:23 UTC

[bookkeeper] 06/08: [fix][server]fix memory leak when closeRecovered,failed on clearing newEnsemblesFromRecovery (#3672)

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

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

commit bf18fc5aa08193b199d05b70a187c61be0c55d12
Author: StevenLuMT <ls...@126.com>
AuthorDate: Wed Dec 7 17:30:17 2022 +0800

    [fix][server]fix memory leak when closeRecovered,failed on clearing newEnsemblesFromRecovery (#3672)
    
    Co-authored-by: lushiji <lu...@didiglobal.com>
    (cherry picked from commit a19d849a370d0b3eed73bb90f329b47f00730146)
---
 .../org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
index 1d21fc9377..0f6f4d67aa 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
@@ -330,11 +330,14 @@ class ReadOnlyLedgerHandle extends LedgerHandle implements LedgerMetadataListene
                     return builder.withClosedState().withLastEntryId(lac).withLength(len).build();
                 },
                 this::setLedgerMetadata).run();
-        f.thenRun(() -> {
-                synchronized (metadataLock) {
-                    newEnsemblesFromRecovery.clear();
-                }
-            });
+        f.whenComplete((result, exception) -> {
+            synchronized (metadataLock) {
+                newEnsemblesFromRecovery.clear();
+            }
+            if (exception != null) {
+                LOG.error("When closeRecovered,failed on clearing newEnsemblesFromRecovery.", exception);
+            }
+        });
         return f;
     }