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

Update Stream Ack Manager unit test and code refactor #4383

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Update Stream Ack Manager unit test and code refactor #4383

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
6f9a6dc
Update Stream Ack Manager unit test
dinujoh Apr 2, 2024
5347ba3
Move CheckpointStatus to stream sub package and make it package prote…
dinujoh Apr 2, 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
2 changes: 1 addition & 1 deletion .../src/main/java/org/opensearch/dataprepper/plugins/mongo/export/ExportPartitionWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void run() {
int lastRecordNumberProcessed = 0;
final List<String> records = new ArrayList<>();
try (MongoCursor<Document> cursor = col.find(query).iterator()) {
while (cursor.hasNext()) {
while (cursor.hasNext() && !Thread.currentThread().isInterrupted()) {
if (shouldStop) {
partitionCheckpoint.checkpoint(lastRecordNumberProcessed);
LOG.warn("Loading data query {} was interrupted by a shutdown signal, giving up ownership of " +
Expand Down
8 changes: 3 additions & 5 deletions ...plugins/mongo/model/CheckpointStatus.java → ...lugins/mongo/stream/CheckpointStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.opensearch.dataprepper.plugins.mongo.model;
package org.opensearch.dataprepper.plugins.mongo.stream;

public class CheckpointStatus {
class CheckpointStatus {
private final String resumeToken;
private final long recordCount;
private boolean acknowledged;
private final long createTimestamp;
private Long acknowledgedTimestamp;

public CheckpointStatus(final String resumeToken, final long recordCount, final long createTimestamp) {
CheckpointStatus(final String resumeToken, final long recordCount, final long createTimestamp) {
this.resumeToken = resumeToken;
this.recordCount = recordCount;
this.acknowledged = false;
Expand Down Expand Up @@ -40,6 +40,4 @@ public long getCreateTimestamp() {
public long getAcknowledgedTimestamp() {
return acknowledgedTimestamp;
}


}
1 change: 0 additions & 1 deletion ...in/java/org/opensearch/dataprepper/plugins/mongo/stream/StreamAcknowledgementManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.opensearch.dataprepper.common.concurrent.BackgroundThreadFactory;
import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet;
import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;
import org.opensearch.dataprepper.plugins.mongo.model.CheckpointStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
5 changes: 2 additions & 3 deletions ...ava/org/opensearch/dataprepper/plugins/mongo/stream/StreamAcknowledgementManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.mockito.junit.jupiter.MockitoExtension;
import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet;
import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSetManager;
import org.opensearch.dataprepper.plugins.mongo.model.CheckpointStatus;

import java.time.Duration;
import java.util.List;
Expand Down Expand Up @@ -83,7 +82,7 @@ public void createAcknowledgementSet_enabled_ackSetWithAck() {

@Test
public void createAcknowledgementSet_enabled_multipleAckSetWithAck() {
when(timeout.getSeconds()).thenReturn(10_000L);
lenient().when(timeout.getSeconds()).thenReturn(10_000L);
streamAckManager = new StreamAcknowledgementManager(acknowledgementSetManager, partitionCheckpoint, timeout, 0, 0);
streamAckManager.init(stopWorkerConsumer);
final String resumeToken1 = UUID.randomUUID().toString();
Expand Down Expand Up @@ -174,5 +173,5 @@ public void createAcknowledgementSet_enabled_ackSetWithNoAck() {
await()
.atMost(Duration.ofSeconds(10)).untilAsserted(() ->
verify(stopWorkerConsumer).accept(null));
}
}
}
Loading