Skip to content

[Pull-based Ingestion] Add warning when message is dropped #18304

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
merged 1 commit into from
May 15, 2025
Merged

[Pull-based Ingestion] Add warning when message is dropped #18304

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions server/src/main/java/org/opensearch/indices/pollingingest/MessageProcessorRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ public void run() {
errorStrategy.handleError(e, IngestionErrorStrategy.ErrorStage.PROCESSING);
boolean retriesExhausted = retryCount >= MIN_RETRY_COUNT || e instanceof IllegalArgumentException;
if (retriesExhausted && errorStrategy.shouldIgnoreError(e, IngestionErrorStrategy.ErrorStage.PROCESSING)) {
logDroppedMessage(shardUpdateMessage);
shardUpdateMessage = null;
retryCount = 0;
messageProcessorMetrics.failedMessageDroppedCounter.inc();
Expand Down Expand Up @@ -360,6 +361,13 @@ public void close() {
closed = true;
}

private void logDroppedMessage(ShardUpdateMessage shardUpdateMessage) {
String id = shardUpdateMessage.autoGeneratedIdTimestamp() == UNSET_AUTO_GENERATED_TIMESTAMP
? (String) shardUpdateMessage.parsedPayloadMap().get(ID)
: "null";
logger.warn("Exhausted retries, dropping message: _id:{}, pointer:{}", id, shardUpdateMessage.pointer().asString());
}

/**
* Tracks MessageProcessor metrics.
*/
Expand Down
23 changes: 12 additions & 11 deletions server/src/test/java/org/opensearch/indices/pollingingest/MessageProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
package org.opensearch.indices.pollingingest;

import org.opensearch.action.DocWriteRequest;
import org.opensearch.index.IngestionShardPointer;
import org.opensearch.index.Message;
import org.opensearch.index.engine.Engine;
import org.opensearch.index.engine.FakeIngestionSource;
Expand All @@ -23,6 +24,7 @@

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -240,29 +242,28 @@ public void testMessageRetrySuccess() throws Exception {
thread.interrupt();
}

public void testMessageRetryFail() throws Exception {
public void testDropPolicyMessageRetryFail() throws Exception {
MessageProcessorRunnable.MessageProcessor processor = mock(MessageProcessorRunnable.MessageProcessor.class);
DropIngestionErrorStrategy errorStrategy = new DropIngestionErrorStrategy("ingestion_source");
MessageProcessorRunnable messageProcessorRunnable = new MessageProcessorRunnable(
new ArrayBlockingQueue<>(5),
processor,
errorStrategy
);
messageProcessorRunnable.getBlockingQueue().put(new ShardUpdateMessage(null, null, null, 0));
messageProcessorRunnable.getBlockingQueue()
.put(new ShardUpdateMessage(mock(IngestionShardPointer.class), null, Collections.emptyMap(), 0));
messageProcessorRunnable.getBlockingQueue()
.put(new ShardUpdateMessage(mock(IngestionShardPointer.class), null, Collections.emptyMap(), -1));

doThrow(new RuntimeException()).doThrow(new RuntimeException())
.doThrow(new RuntimeException())
.doNothing()
.when(processor)
.process(any(), any());
doThrow(new RuntimeException()).when(processor).process(any(), any());

Thread thread = new Thread(messageProcessorRunnable::run);
thread.start();
assertBusy(() -> {
verify(processor, times(3)).process(any(), any());
assertEquals(1, messageProcessorRunnable.getMessageProcessorMetrics().failedMessageDroppedCounter().count());
assertEquals(3, messageProcessorRunnable.getMessageProcessorMetrics().failedMessageCounter().count());
}, 1, TimeUnit.MINUTES);
verify(processor, times(6)).process(any(), any());
assertEquals(2, messageProcessorRunnable.getMessageProcessorMetrics().failedMessageDroppedCounter().count());
assertEquals(6, messageProcessorRunnable.getMessageProcessorMetrics().failedMessageCounter().count());
}, 2, TimeUnit.MINUTES);

messageProcessorRunnable.close();
thread.interrupt();
Expand Down
Loading