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 bug where process worker would shut down if a processor drops all… #4262

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Fix bug where process worker would shut down if a processor drops all… #4262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2583aac
Fix bug where process worker would shut down if a processor drops all…
graytaylor0 Mar 11, 2024
9568920
Add unit test
graytaylor0 Mar 11, 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
9 changes: 4 additions & 5 deletions data-prepper-core/src/main/java/org/opensearch/dataprepper/pipeline/ProcessWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import org.opensearch.dataprepper.metrics.PluginMetrics;
import org.opensearch.dataprepper.model.CheckpointState;
import org.opensearch.dataprepper.model.buffer.Buffer;
import org.opensearch.dataprepper.model.processor.Processor;
import org.opensearch.dataprepper.model.record.Record;
import org.opensearch.dataprepper.model.event.DefaultEventHandle;
import org.opensearch.dataprepper.model.event.Event;
import org.opensearch.dataprepper.model.event.EventHandle;
import org.opensearch.dataprepper.model.event.DefaultEventHandle;
import org.opensearch.dataprepper.model.event.InternalEventHandle;
import org.opensearch.dataprepper.model.processor.Processor;
import org.opensearch.dataprepper.model.record.Record;
import org.opensearch.dataprepper.pipeline.common.FutureHelper;
import org.opensearch.dataprepper.pipeline.common.FutureHelperResult;
import org.slf4j.Logger;
Expand All @@ -23,7 +23,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
Expand Down Expand Up @@ -129,7 +128,7 @@ private void doRun() {

List<Event> inputEvents = null;
if (acknowledgementsEnabled) {
inputEvents = ((ArrayList<Record<Event>>) records).stream().map(Record::getData).collect(Collectors.toList());
inputEvents = ((List<Record<Event>>) records).stream().map(Record::getData).collect(Collectors.toList());
}

try {
Expand Down
43 changes: 43 additions & 0 deletions data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/ProcessWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,47 @@ void testProcessWorkerWithProcessorThrowingExceptionAndAcknowledgmentsEnabledIsH

verify(skippedProcessor, never()).execute(any());
}

@Test
void testProcessWorkerWithProcessorDroppingAllRecordsAndAcknowledgmentsEnabledIsHandledProperly() {

when(source.areAcknowledgementsEnabled()).thenReturn(true);

final List<Record<Event>> records = new ArrayList<>();
final Record<Event> mockRecord = mock(Record.class);
final Event mockEvent = mock(Event.class);
final EventHandle eventHandle = mock(DefaultEventHandle.class);
when(((DefaultEventHandle) eventHandle).getAcknowledgementSet()).thenReturn(mock(AcknowledgementSet.class));
doNothing().when(eventHandle).release(true);
when(mockRecord.getData()).thenReturn(mockEvent);
when(mockEvent.getEventHandle()).thenReturn(eventHandle);

records.add(mockRecord);

final CheckpointState checkpointState = mock(CheckpointState.class);
final Map.Entry<Collection, CheckpointState> readResult = Map.entry(records, checkpointState);
when(buffer.read(pipeline.getReadBatchTimeoutInMillis())).thenReturn(readResult);

final Processor processor = mock(Processor.class);
when(processor.execute(records)).thenReturn(Collections.emptyList());
when(processor.isReadyForShutdown()).thenReturn(true);

final Processor secondProcessor = mock(Processor.class);
when(secondProcessor.isReadyForShutdown()).thenReturn(true);
when(secondProcessor.execute(Collections.emptyList())).thenReturn(Collections.emptyList());
processors = List.of(processor, secondProcessor);

final FutureHelperResult<Void> futureHelperResult = mock(FutureHelperResult.class);
when(futureHelperResult.getFailedReasons()).thenReturn(Collections.emptyList());


try (final MockedStatic<FutureHelper> futureHelperMockedStatic = mockStatic(FutureHelper.class)) {
futureHelperMockedStatic.when(() -> FutureHelper.awaitFuturesIndefinitely(sinkFutures))
.thenReturn(futureHelperResult);

final ProcessWorker processWorker = createObjectUnderTest();

processWorker.run();
}
}
}
Loading