Skip to content

Fix flaky testConsumerReinitializationWithNoInitialMessages test #20934

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

Merged
varunbharadwaj merged 1 commit into from
Mar 20, 2026
Merged

Fix flaky testConsumerReinitializationWithNoInitialMessages test #20934

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions server/src/test/java/org/opensearch/indices/pollingingest/DefaultStreamPollerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,11 +695,18 @@ public void testConsumerReinitializationWithNoInitialMessages() throws Exception
// Verify no messages processed
verify(processor, never()).process(any(), any());

// Request consumer reinitialization
// Request consumer reinitialization and wait for it to complete before adding messages
IngestionShardConsumer oldConsumer = poller.getConsumer();
IngestionSource mockIngestionSource = new IngestionSource.Builder("test").build();
poller.requestConsumerReinitialization(mockIngestionSource);

// Add a message
assertBusy(() -> {
IngestionShardConsumer currentConsumer = poller.getConsumer();
assertNotNull(currentConsumer);
assertNotSame(oldConsumer, currentConsumer);
}, 30, TimeUnit.SECONDS);

// Add a message after reinitialization is complete
messages.add("{\"_id\":\"1\",\"_source\":{\"name\":\"bob\", \"age\": 24}}".getBytes(StandardCharsets.UTF_8));

// Wait for the message to be processed
Expand Down
Loading