[incubator-pulsar] branch master updated: ManagedLedger only closes ledger on error if current ledger (#240) (#2573)

[mm...@apache.org]

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 7c62ecf  ManagedLedger only closes ledger on error if current ledger (#240) (#2573)
7c62ecf is described below

commit 7c62ecf4d75ad396066add41246fcb4f92a7c301
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Fri Sep 14 00:59:55 2018 +0200

    ManagedLedger only closes ledger on error if current ledger (#240) (#2573)
    
    If we have a managed ledger, ml and we write 2 entries to it, if both
    entries fail, both will end up calling ManagedLedgerImpl#ledgerClosed
    with the ledger the write failed on as a parameter.
    
    However, depending on timing, the second call to ledgerClosed could
    end up adding a new ledger to the ledger list, even though the current
    ledger is _not_ failing (as the failing ledger was replaced by the
    first call).
    
    This was the cause of a flake in
    ManagedLedgerErrorsTest#recoverLongTimeAfterMultipleWriteErrors as
    reported in (#240). However, it's not possible to get a deterministic
    test for this as the timings need to be very precise. The failing
    addComplete needs to run before first error handling completes, but
    the runnable with ledgerClosed for the second failure needs to run
    after the first error handling completes, but before the write resends
    from the first error handling complete.
---
 .../java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 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 6e4a609..f332e17 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
@@ -1277,7 +1277,8 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
 
     synchronized void ledgerClosed(final LedgerHandle lh) {
         final State state = STATE_UPDATER.get(this);
-        if (state == State.ClosingLedger || state == State.LedgerOpened) {
+        LedgerHandle currentLedger = this.currentLedger;
+        if (currentLedger == lh && (state == State.ClosingLedger || state == State.LedgerOpened)) {
             STATE_UPDATER.set(this, State.ClosedLedger);
         } else if (state == State.Closed) {
             // The managed ledger was closed during the write operation