-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix][broker] Reader stuck after call hasMessageAvailable when enable…
… replicateSubscriptionState
- Loading branch information
Showing
8 changed files
with
349 additions
and
31 deletions.
There are no files selected for viewing
82 changes: 82 additions & 0 deletions
82
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/ManagedLedgerImplUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.bookkeeper.mledger.util; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.function.Predicate; | ||
| import org.apache.bookkeeper.mledger.AsyncCallbacks; | ||
| import org.apache.bookkeeper.mledger.Entry; | ||
| import org.apache.bookkeeper.mledger.ManagedLedgerException; | ||
| import org.apache.bookkeeper.mledger.Position; | ||
| import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; | ||
| import org.apache.bookkeeper.mledger.impl.PositionImpl; | ||
| import org.apache.pulsar.common.classification.InterfaceStability; | ||
|
|
||
| @InterfaceStability.Evolving | ||
| public class ManagedLedgerImplUtils { | ||
|
|
||
| /** | ||
| * Reverse find last valid position one-entry by one-entry. | ||
| */ | ||
| public static CompletableFuture<Position> asyncGetLastValidPosition(final ManagedLedgerImpl ledger, | ||
| final Predicate<Entry> predicate) { | ||
| CompletableFuture<Position> future = new CompletableFuture<>(); | ||
| PositionImpl lastPosition = (PositionImpl) ledger.getLastConfirmedEntry(); | ||
| if (!ledger.isValidPosition(lastPosition)) { | ||
| future.complete(lastPosition); | ||
| } else { | ||
| internalAsyncReverseFindPositionOneByOne(ledger, predicate, lastPosition, future); | ||
| } | ||
| return future; | ||
| } | ||
|
|
||
| private static void internalAsyncReverseFindPositionOneByOne(final ManagedLedgerImpl ledger, | ||
| final Predicate<Entry> predicate, | ||
| final PositionImpl position, | ||
| final CompletableFuture<Position> future) { | ||
| ledger.asyncReadEntry(position, new AsyncCallbacks.ReadEntryCallback() { | ||
| @Override | ||
| public void readEntryComplete(Entry entry, Object ctx) { | ||
| final Position position = entry.getPosition(); | ||
| try { | ||
| if (predicate.test(entry)) { | ||
| future.complete(position); | ||
| return; | ||
| } | ||
| PositionImpl previousPosition = ledger.getPreviousPosition((PositionImpl) position); | ||
| if (!ledger.isValidPosition(previousPosition)) { | ||
| future.complete(previousPosition); | ||
| } else { | ||
| internalAsyncReverseFindPositionOneByOne(ledger, predicate, | ||
| ledger.getPreviousPosition((PositionImpl) position), future); | ||
| } | ||
| } catch (Exception e) { | ||
| future.completeExceptionally(e); | ||
| } finally { | ||
| entry.release(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void readEntryFailed(ManagedLedgerException exception, Object ctx) { | ||
| future.completeExceptionally(exception); | ||
| } | ||
| }, null); | ||
| } | ||
| } |
73 changes: 73 additions & 0 deletions
73
...d-ledger/src/test/java/org/apache/bookkeeper/mledger/util/ManagedLedgerImplUtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.bookkeeper.mledger.util; | ||
|
|
||
| import static java.nio.charset.StandardCharsets.UTF_8; | ||
| import static org.testng.Assert.assertEquals; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.function.Predicate; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.bookkeeper.mledger.Entry; | ||
| import org.apache.bookkeeper.mledger.ManagedLedger; | ||
| import org.apache.bookkeeper.mledger.ManagedLedgerConfig; | ||
| import org.apache.bookkeeper.mledger.Position; | ||
| import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; | ||
| import org.apache.bookkeeper.test.MockedBookKeeperTestCase; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| @Slf4j | ||
| public class ManagedLedgerImplUtilsTest extends MockedBookKeeperTestCase { | ||
|
|
||
| @Test | ||
| public void testGetLastValidPosition() throws Exception { | ||
| final int maxEntriesPerLedger = 5; | ||
|
|
||
| ManagedLedgerConfig managedLedgerConfig = new ManagedLedgerConfig(); | ||
| managedLedgerConfig.setMaxEntriesPerLedger(maxEntriesPerLedger); | ||
| ManagedLedger ledger = factory.open("testReverseFindPositionOneByOne", managedLedgerConfig); | ||
|
|
||
| String matchEntry = "match-entry"; | ||
| String noMatchEntry = "nomatch-entry"; | ||
| Predicate<Entry> predicate = entry -> { | ||
| String entryValue = entry.getDataBuffer().toString(UTF_8); | ||
| return matchEntry.equals(entryValue); | ||
| }; | ||
|
|
||
| // New ledger will return the last position, regardless of whether the conditions are met or not. | ||
| Position position = | ||
| ManagedLedgerImplUtils.asyncGetLastValidPosition((ManagedLedgerImpl) ledger, predicate).get(); | ||
| assertEquals(ledger.getLastConfirmedEntry(), position); | ||
|
|
||
| for (int i = 0; i < maxEntriesPerLedger - 1; i++) { | ||
| ledger.addEntry(matchEntry.getBytes(StandardCharsets.UTF_8)); | ||
| } | ||
| Position lastMatchPosition = ledger.addEntry(matchEntry.getBytes(StandardCharsets.UTF_8)); | ||
| for (int i = 0; i < maxEntriesPerLedger; i++) { | ||
| ledger.addEntry(noMatchEntry.getBytes(StandardCharsets.UTF_8)); | ||
| } | ||
|
|
||
| // Returns last position of entry is "match-entry" | ||
| position = | ||
| ManagedLedgerImplUtils.asyncGetLastValidPosition((ManagedLedgerImpl) ledger, predicate).get(); | ||
| assertEquals(position, lastMatchPosition); | ||
|
|
||
| ledger.close(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.