Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix][test] Flaky-test: testMessageExpiryWithTimestampNonRecoverableException and testIncorrectClientClock #22489

Merged
merged 3 commits into from
Apr 15, 2024
Merged

[fix][test] Flaky-test: testMessageExpiryWithTimestampNonRecoverableException and testIncorrectClientClock #22489

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1743f49
[fix][test] Flaky-test: PersistentMessageFinderTest.testMessageExpiry…
shibd Apr 12, 2024
c101eae
Use Awaitility and refator PersistentMessageExpiryMonitor test code
shibd Apr 12, 2024
1be7f36
fix same flaky test: testIncorrectClientClock
shibd Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions ...ar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.service;

import static org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest.retryStrategically;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doAnswer;
Expand Down Expand Up @@ -383,7 +382,7 @@ public static Set<BrokerEntryMetadataInterceptor> getBrokerEntryMetadataIntercep
*
* @throws Exception
*/
@Test(groups = "flaky")
@Test
void testMessageExpiryWithTimestampNonRecoverableException() throws Exception {

final String ledgerAndCursorName = "testPersistentMessageExpiryWithNonRecoverableLedgers";
Expand All @@ -402,11 +401,15 @@ void testMessageExpiryWithTimestampNonRecoverableException() throws Exception {
for (int i = 0; i < totalEntries; i++) {
ledger.addEntry(createMessageWrittenToLedger("msg" + i));
}
Awaitility.await().untilAsserted(() ->
assertEquals(ledger.getState(), ManagedLedgerImpl.State.LedgerOpened));

List<LedgerInfo> ledgers = ledger.getLedgersInfoAsList();
LedgerInfo lastLedgerInfo = ledgers.get(ledgers.size() - 1);

assertEquals(ledgers.size(), totalEntries / entriesPerLedger);
// The `lastLedgerInfo` should be newly opened, and it does not contain any entries.
// Please refer to: https://github.com/apache/pulsar/pull/22034
assertEquals(lastLedgerInfo.getEntries(), 0);
assertEquals(ledgers.size(), totalEntries / entriesPerLedger + 1);

// this will make sure that all entries should be deleted
Thread.sleep(TimeUnit.SECONDS.toMillis(ttlSeconds));
Expand All @@ -420,40 +423,39 @@ void testMessageExpiryWithTimestampNonRecoverableException() throws Exception {
when(mock.getLastPosition()).thenReturn(PositionImpl.EARLIEST);

PersistentMessageExpiryMonitor monitor = new PersistentMessageExpiryMonitor(mock, c1.getName(), c1, null);
Position previousMarkDelete = null;
for (int i = 0; i < totalEntries; i++) {
monitor.expireMessages(1);
shibd marked this conversation as resolved.
Show resolved Hide resolved
Position previousPos = previousMarkDelete;
retryStrategically(
(test) -> c1.getMarkDeletedPosition() != null && !c1.getMarkDeletedPosition().equals(previousPos),
5, 100);
previousMarkDelete = c1.getMarkDeletedPosition();
}

PositionImpl markDeletePosition = (PositionImpl) c1.getMarkDeletedPosition();
assertEquals(lastLedgerInfo.getLedgerId(), markDeletePosition.getLedgerId());
assertEquals(lastLedgerInfo.getEntries() - 1, markDeletePosition.getEntryId());
assertTrue(monitor.expireMessages(ttlSeconds));
Awaitility.await().untilAsserted(() -> {
PositionImpl markDeletePosition = (PositionImpl) c1.getMarkDeletedPosition();
// The markDeletePosition points to the last entry of the previous ledger in lastLedgerInfo.
assertEquals(markDeletePosition.getLedgerId(), lastLedgerInfo.getLedgerId() - 1);
assertEquals(markDeletePosition.getEntryId(), entriesPerLedger - 1);
});

c1.close();
ledger.close();
factory.shutdown();

}

@Test(groups = "flaky")
@Test
public void testIncorrectClientClock() throws Exception {
final String ledgerAndCursorName = "testIncorrectClientClock";
int maxTTLSeconds = 1;
int entriesNum = 10;
ManagedLedgerConfig config = new ManagedLedgerConfig();
config.setMaxEntriesPerLedger(1);
ManagedLedgerImpl ledger = (ManagedLedgerImpl) factory.open(ledgerAndCursorName, config);
ManagedCursorImpl c1 = (ManagedCursorImpl) ledger.openCursor(ledgerAndCursorName);
// set client clock to 10 days later
long incorrectPublishTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(10);
for (int i = 0; i < 10; i++) {
for (int i = 0; i < entriesNum; i++) {
ledger.addEntry(createMessageWrittenToLedger("msg" + i, incorrectPublishTimestamp));
}
assertEquals(ledger.getLedgersInfoAsList().size(), 10);
Awaitility.await().untilAsserted(() ->
assertEquals(ledger.getState(), ManagedLedgerImpl.State.LedgerOpened));
// The number of ledgers should be (entriesNum / MaxEntriesPerLedger) + 1
// Please refer to: https://github.com/apache/pulsar/pull/22034
assertEquals(ledger.getLedgersInfoAsList().size(), entriesNum + 1);
PersistentTopic mock = mock(PersistentTopic.class);
when(mock.getName()).thenReturn("topicname");
when(mock.getLastPosition()).thenReturn(PositionImpl.EARLIEST);
Expand Down
Loading