You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by bo...@apache.org on 2022/11/08 07:46:04 UTC
[pulsar] branch branch-2.9 updated: [fix][test]Fix ManagedLedgerTest#avoidUseSameOpAddEntryBetweenDifferentLedger (#16720)
This is an automated email from the ASF dual-hosted git repository.
bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new e5033aa5072 [fix][test]Fix ManagedLedgerTest#avoidUseSameOpAddEntryBetweenDifferentLedger (#16720)
e5033aa5072 is described below
commit e5033aa50722fd20e7d34363a50937b4810f46e7
Author: Xiaoyu Hou <An...@gmail.com>
AuthorDate: Wed Jul 27 09:59:35 2022 +0800
[fix][test]Fix ManagedLedgerTest#avoidUseSameOpAddEntryBetweenDifferentLedger (#16720)
(cherry picked from commit 64821e1bff305203022f9cb28a233926667a54d8)
---
.../org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
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 c0b3d25af0c..e03156256f6 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
@@ -2910,10 +2910,15 @@ public class ManagedLedgerTest extends MockedBookKeeperTestCase {
if (i > 4) {
Assert.assertEquals(oldOp.getState(), OpAddEntry.State.CLOSED);
} else {
- Assert.assertEquals(oldOp.getState(), OpAddEntry.State.INITIATED);
+ // When call `OpAddEntry#initiate`, which happens in `ledger.updateLedgersIdsComplete` above, the
+ // `OpAddEntry` state will be `INITIATED` if `ledger.asyncAddEntry` doesn't complete, otherwise, the
+ // state will be `COMPLETED`
+ Assert.assertTrue(oldOp.getState() == OpAddEntry.State.INITIATED
+ || oldOp.getState() == OpAddEntry.State.COMPLETED);
}
OpAddEntry newOp = ledger.pendingAddEntries.poll();
- Assert.assertEquals(newOp.getState(), OpAddEntry.State.INITIATED);
+ Assert.assertTrue(newOp.getState() == OpAddEntry.State.INITIATED
+ || newOp.getState() == OpAddEntry.State.COMPLETED);
if (i > 4) {
Assert.assertNotSame(oldOp, newOp);
} else {