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

Jump to bottom

Fix bug where race condition on ack callback could cause S3 folder partition to not be given up #4835

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Fix bug where race condition on ack callback could cause S3 folder partition to not be given up #4835

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
5 changes: 2 additions & 3 deletions ...3-source/src/main/java/org/opensearch/dataprepper/plugins/source/s3/ScanObjectWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,6 @@ private void processFolderPartition(final SourcePartition<S3SourceProgressState>
sourceCoordinator.saveProgressStateForPartition(folderPartition.getPartitionKey(), folderPartitionState.get());

processObjectsForFolderPartition(objectsToProcess, folderPartition);

sourceCoordinator.updatePartitionForAcknowledgmentWait(folderPartition.getPartitionKey(), ACKNOWLEDGEMENT_SET_TIMEOUT);
}

private List<S3ObjectReference> getObjectsForPrefix(final String bucket, final String s3Prefix) {
Expand Down Expand Up @@ -364,7 +362,8 @@ private void processObjectsForFolderPartition(final List<S3ObjectReference> obje
objectIndex++;
}

// Complete the final acknowledgment set
sourceCoordinator.updatePartitionForAcknowledgmentWait(folderPartition.getPartitionKey(), ACKNOWLEDGEMENT_SET_TIMEOUT);

if (acknowledgementSet != null) {
acknowledgementSet.complete();
}
Expand Down
4 changes: 2 additions & 2 deletions ...ce/src/test/java/org/opensearch/dataprepper/plugins/source/s3/S3ScanObjectWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,8 @@ void processing_with_folder_partition_processes_objects_in_folder_and_deletes_th
inOrder.verify(s3ObjectDeleteWorker).buildDeleteObjectRequest(bucket, firstObject.key());
inOrder.verify(acknowledgementSet1).complete();
inOrder.verify(s3ObjectDeleteWorker).buildDeleteObjectRequest(bucket, secondObject.key());
inOrder.verify(acknowledgementSet2).complete();
inOrder.verify(sourceCoordinator).updatePartitionForAcknowledgmentWait(partitionKey, ACKNOWLEDGEMENT_SET_TIMEOUT);
inOrder.verify(acknowledgementSet2).complete();

final Consumer<Boolean> firstAckCallback = ackCallbacks.get(0);
firstAckCallback.accept(true);
Expand Down Expand Up @@ -532,8 +532,8 @@ void processing_with_folder_partition_processes_objects_in_folder_until_max_obje
final InOrder inOrder = inOrder(sourceCoordinator, acknowledgementSet1, s3ObjectDeleteWorker);

inOrder.verify(s3ObjectDeleteWorker).buildDeleteObjectRequest(bucket, firstObject.key());
inOrder.verify(acknowledgementSet1).complete();
inOrder.verify(sourceCoordinator).updatePartitionForAcknowledgmentWait(partitionKey, ACKNOWLEDGEMENT_SET_TIMEOUT);
inOrder.verify(acknowledgementSet1).complete();

final Consumer<Boolean> ackCallback = consumerArgumentCaptor.getValue();
ackCallback.accept(true);
Expand Down
Loading