diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index c3f0ffdab74af..10cfb9474c164 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -45,7 +45,7 @@ - sourceDefinitionId: b5ea17b1-f170-46dc-bc31-cc744ca984c1 name: Microsoft SQL Server (MSSQL) dockerRepository: airbyte/source-mssql - dockerImageTag: 0.3.4 + dockerImageTag: 0.3.5 documentationUrl: https://docs.airbyte.io/integrations/sources/mssql icon: mssql.svg - sourceDefinitionId: d8286229-c680-4063-8c59-23b9b391c700 @@ -56,7 +56,7 @@ - sourceDefinitionId: decd338e-5647-4c0b-adf4-da0e75f5a750 name: Postgres dockerRepository: airbyte/source-postgres - dockerImageTag: 0.3.9 + dockerImageTag: 0.3.10 documentationUrl: https://docs.airbyte.io/integrations/sources/postgres icon: postgresql.svg - sourceDefinitionId: 9fa5862c-da7c-11eb-8d19-0242ac130003 @@ -101,7 +101,7 @@ - sourceDefinitionId: 435bb9a5-7887-4809-aa58-28c27df0d7ad name: MySQL dockerRepository: airbyte/source-mysql - dockerImageTag: 0.4.3 + dockerImageTag: 0.4.4 documentationUrl: https://docs.airbyte.io/integrations/sources/mysql icon: mysql.svg - sourceDefinitionId: 2470e835-feaf-4db6-96f3-70fd645acc77 diff --git a/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordIterator.java b/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordIterator.java index 38e9e8298f087..6b65d396fa78c 100644 --- a/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordIterator.java +++ b/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordIterator.java @@ -63,6 +63,7 @@ public class DebeziumRecordIterator extends AbstractIterator> queue, CdcTargetPosition targetPosition, @@ -74,6 +75,7 @@ public DebeziumRecordIterator(LinkedBlockingQueue> q this.requestClose = requestClose; this.receivedFirstRecord = false; this.hasSnapshotFinished = true; + this.signalledClose = false; } @Override @@ -103,7 +105,7 @@ protected ChangeEvent computeNext() { hasSnapshotFinished = hasSnapshotFinished(eventAsJson); // if the last record matches the target file position, it is time to tell the producer to shutdown. - if (shouldSignalClose(eventAsJson)) { + if (!signalledClose && shouldSignalClose(eventAsJson)) { requestClose(); } receivedFirstRecord = true; @@ -135,8 +137,7 @@ private boolean hasSnapshotFinished(JsonNode eventAsJson) { */ @Override public void close() throws Exception { - requestClose.call(); - throwExceptionIfSnapshotNotFinished(); + requestClose(); } private boolean shouldSignalClose(JsonNode eventAsJson) { @@ -146,6 +147,7 @@ private boolean shouldSignalClose(JsonNode eventAsJson) { private void requestClose() { try { requestClose.call(); + signalledClose = true; } catch (Exception e) { throw new RuntimeException(e); } diff --git a/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordPublisher.java b/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordPublisher.java index 8c7ebd6c0991e..1eb4234100ad1 100644 --- a/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordPublisher.java +++ b/airbyte-integrations/bases/debezium/src/main/java/io/airbyte/integrations/debezium/internals/DebeziumRecordPublisher.java @@ -98,13 +98,6 @@ public void start(Queue> queue) { boolean inserted = false; while (!inserted) { inserted = queue.offer(e); - if (!inserted) { - try { - Thread.sleep(10); - } catch (InterruptedException interruptedException) { - throw new RuntimeException(interruptedException); - } - } } } }) diff --git a/airbyte-integrations/connectors/source-mssql/Dockerfile b/airbyte-integrations/connectors/source-mssql/Dockerfile index 6a9e86c5fb704..b73819559a359 100644 --- a/airbyte-integrations/connectors/source-mssql/Dockerfile +++ b/airbyte-integrations/connectors/source-mssql/Dockerfile @@ -8,5 +8,5 @@ COPY build/distributions/${APPLICATION}*.tar ${APPLICATION}.tar RUN tar xf ${APPLICATION}.tar --strip-components=1 -LABEL io.airbyte.version=0.3.4 +LABEL io.airbyte.version=0.3.5 LABEL io.airbyte.name=airbyte/source-mssql diff --git a/airbyte-integrations/connectors/source-mysql/Dockerfile b/airbyte-integrations/connectors/source-mysql/Dockerfile index 28350e873fb8d..be143ba62883d 100644 --- a/airbyte-integrations/connectors/source-mysql/Dockerfile +++ b/airbyte-integrations/connectors/source-mysql/Dockerfile @@ -8,6 +8,6 @@ COPY build/distributions/${APPLICATION}*.tar ${APPLICATION}.tar RUN tar xf ${APPLICATION}.tar --strip-components=1 -LABEL io.airbyte.version=0.4.3 +LABEL io.airbyte.version=0.4.4 LABEL io.airbyte.name=airbyte/source-mysql diff --git a/airbyte-integrations/connectors/source-postgres/Dockerfile b/airbyte-integrations/connectors/source-postgres/Dockerfile index 4dd7d07dae0fb..77b233ac63614 100644 --- a/airbyte-integrations/connectors/source-postgres/Dockerfile +++ b/airbyte-integrations/connectors/source-postgres/Dockerfile @@ -8,5 +8,5 @@ COPY build/distributions/${APPLICATION}*.tar ${APPLICATION}.tar RUN tar xf ${APPLICATION}.tar --strip-components=1 -LABEL io.airbyte.version=0.3.9 +LABEL io.airbyte.version=0.3.10 LABEL io.airbyte.name=airbyte/source-postgres