[pulsar] branch branch-2.6 updated: Fix producer stucks on creating ledger timeout

[rxl]

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

rxl pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new e2fbf31  Fix producer stucks on creating ledger timeout
e2fbf31 is described below

commit e2fbf31ff34f2aa94276ab6103c73cec23849c1b
Author: Sijie Guo <si...@apache.org>
AuthorDate: Mon Jun 22 13:32:28 2020 -0700

    Fix producer stucks on creating ledger timeout
    
    Signed-off-by: xiaolong.ran <r...@apache.org>
---
 .../main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java  | 1 +
 .../test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java  | 1 +
 2 files changed, 2 insertions(+)

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 eaf06fc..a162efa 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
@@ -3197,6 +3197,7 @@ public class ManagedLedgerImpl implements ManagedLedger, 
CreateCallback {
                 if (log.isDebugEnabled()) {
                     log.debug("[{}] Ledger already created when timeout task 
is triggered", name);
                 }
+                cb.createComplete(BKException.Code.TimeoutException, null, 
ledgerCreated);
             }
             cb.createComplete(BKException.Code.TimeoutException, null, 
ledgerCreated);
         }, config.getMetadataOperationsTimeoutSeconds(), TimeUnit.SECONDS);
diff --git 
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
 
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
index 2806a10..9037574 100644
--- 
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
+++ 
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
@@ -95,6 +95,7 @@ import org.apache.bookkeeper.mledger.ManagedLedgerFactory;
 import org.apache.bookkeeper.mledger.ManagedLedgerFactoryConfig;
 import org.apache.bookkeeper.mledger.Position;
 import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl.VoidCallback;
+import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl.State;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;