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

Only STATE and RECORD messages from the Source should be sent to the Destination #16418

Merged
merged 5 commits into from
Sep 9, 2022
Merged

Only STATE and RECORD messages from the Source should be sent to the Destination #16418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65e9c2a
Only STATE and RECORD messages from the Source should be sent to the …
evantahler Sep 7, 2022
ee40c63
add test
evantahler Sep 8, 2022
d3830e1
update mocks
evantahler Sep 8, 2022
58c7981
fixup tests
evantahler Sep 9, 2022
c50afc1
revert mock changes
evantahler Sep 9, 2022
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
7 changes: 6 additions & 1 deletion airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultReplicationWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.airbyte.config.WorkerDestinationConfig;
import io.airbyte.config.WorkerSourceConfig;
import io.airbyte.protocol.models.AirbyteMessage;
import io.airbyte.protocol.models.AirbyteMessage.Type;
import io.airbyte.protocol.models.AirbyteRecordMessage;
import io.airbyte.workers.*;
import io.airbyte.workers.exception.RecordSchemaValidationException;
Expand Down Expand Up @@ -336,11 +337,15 @@ private static Runnable getReplicationRunnable(final AirbyteSource source,
final AirbyteMessage message = mapper.mapMessage(airbyteMessage);

messageTracker.acceptFromSource(message);

try {
destination.accept(message);
if (message.getType() == Type.RECORD || message.getType() == Type.STATE) {
destination.accept(message);
}
} catch (final Exception e) {
throw new DestinationException("Destination process message delivery failed", e);
}

recordsRead += 1;

if (recordsRead % 1000 == 0) {
Expand Down
33 changes: 33 additions & 0 deletions airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultReplicationWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand All @@ -40,6 +41,7 @@
import io.airbyte.config.helpers.LogConfigs;
import io.airbyte.metrics.lib.MetricClient;
import io.airbyte.metrics.lib.MetricClientFactory;
import io.airbyte.protocol.models.AirbyteLogMessage.Level;
import io.airbyte.protocol.models.AirbyteMessage;
import io.airbyte.protocol.models.AirbyteTraceMessage;
import io.airbyte.validation.json.JsonSchemaValidator;
Expand Down Expand Up @@ -181,6 +183,7 @@ void testInvalidSchema() throws Exception {
verify(destination).start(destinationConfig, jobRoot);
verify(destination).accept(RECORD_MESSAGE1);
verify(destination).accept(RECORD_MESSAGE2);
verify(destination).accept(RECORD_MESSAGE3);
verify(recordSchemaValidator).validateSchema(RECORD_MESSAGE1.getRecord(), STREAM_NAME);
verify(recordSchemaValidator).validateSchema(RECORD_MESSAGE2.getRecord(), STREAM_NAME);
verify(recordSchemaValidator).validateSchema(RECORD_MESSAGE3.getRecord(), STREAM_NAME);
Expand Down Expand Up @@ -292,6 +295,36 @@ void testReplicationRunnableWorkerFailure() throws Exception {
.anyMatch(f -> f.getFailureOrigin().equals(FailureOrigin.REPLICATION) && f.getStacktrace().contains(WORKER_ERROR_MESSAGE)));
}

@Test
void testOnlyStateAndRecordMessagesDeliveredToDestination() throws Exception {
final AirbyteMessage LOG_MESSAGE = AirbyteMessageUtils.createLogMessage(Level.INFO, "a log message");
final AirbyteMessage TRACE_MESSAGE = AirbyteMessageUtils.createTraceMessage("a trace message", 123456.0);
when(mapper.mapMessage(LOG_MESSAGE)).thenReturn(LOG_MESSAGE);
when(mapper.mapMessage(TRACE_MESSAGE)).thenReturn(TRACE_MESSAGE);
when(source.isFinished()).thenReturn(false, false, false, false, true);
when(source.attemptRead()).thenReturn(Optional.of(RECORD_MESSAGE1), Optional.of(LOG_MESSAGE), Optional.of(TRACE_MESSAGE),
Optional.of(RECORD_MESSAGE2));

final ReplicationWorker worker = new DefaultReplicationWorker(
JOB_ID,
JOB_ATTEMPT,
source,
mapper,
destination,
messageTracker,
recordSchemaValidator,
workerMetricReporter);

worker.run(syncInput, jobRoot);

verify(source).start(sourceConfig, jobRoot);
verify(destination).start(destinationConfig, jobRoot);
verify(destination).accept(RECORD_MESSAGE1);
verify(destination).accept(RECORD_MESSAGE2);
verify(destination, never()).accept(LOG_MESSAGE);
verify(destination, never()).accept(TRACE_MESSAGE);
}

@Test
void testDestinationNonZeroExitValue() throws Exception {
when(destination.getExitValue()).thenReturn(1);
Expand Down