From commits-return-10976-archive-asf-public=cust-asf.ponee.io@pulsar.incubator.apache.org Thu Jul 12 19:35:50 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 01F79180654 for ; Thu, 12 Jul 2018 19:35:49 +0200 (CEST) Received: (qmail 49761 invoked by uid 500); 12 Jul 2018 17:35:49 -0000 Mailing-List: contact commits-help@pulsar.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pulsar.incubator.apache.org Delivered-To: mailing list commits@pulsar.incubator.apache.org Received: (qmail 49752 invoked by uid 99); 12 Jul 2018 17:35:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2018 17:35:49 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 80203850C7; Thu, 12 Jul 2018 17:35:48 +0000 (UTC) Date: Thu, 12 Jul 2018 17:35:48 +0000 To: "commits@pulsar.apache.org" Subject: [incubator-pulsar] branch master updated: Fixed mem leak when receiving unrecoverable fencing errors in managed ledger (#2138) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153141694836.2827.16326417487872290364@gitbox.apache.org> From: mmerli@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-pulsar X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cc8ec3d962bac1d06f1fad4cac9eca5ea64f733e X-Git-Newrev: 48431543729fc4f382637c968976d0d164d5427b X-Git-Rev: 48431543729fc4f382637c968976d0d164d5427b X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git The following commit(s) were added to refs/heads/master by this push: new 4843154 Fixed mem leak when receiving unrecoverable fencing errors in managed ledger (#2138) 4843154 is described below commit 48431543729fc4f382637c968976d0d164d5427b Author: Matteo Merli AuthorDate: Thu Jul 12 10:35:45 2018 -0700 Fixed mem leak when receiving unrecoverable fencing errors in managed ledger (#2138) --- .../main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 1 - .../src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java index 4978044..fc25ef3 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java @@ -1327,7 +1327,6 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { void clearPendingAddEntries(ManagedLedgerException e) { while (!pendingAddEntries.isEmpty()) { OpAddEntry op = pendingAddEntries.poll(); - op.data.release(); op.failed(e); } } diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java index f4daec5..5d9d57c 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java @@ -96,6 +96,7 @@ class OpAddEntry extends SafeRunnable implements AddCallback, CloseCallback { public void failed(ManagedLedgerException e) { AddEntryCallback cb = callbackUpdater.getAndSet(this, null); + data.release(); if (cb != null) { cb.addFailed(e, ctx); ml.mbean.recordAddEntryError();