From 6d22fcfee0640602310566125566043721b8199d Mon Sep 17 00:00:00 2001 From: Jimmy Ma Date: Tue, 4 Oct 2022 11:11:48 -0700 Subject: [PATCH 1/2] Disable normalization skip when no new data --- .../io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java index 93b350457eda1..5aa7939948673 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java @@ -74,8 +74,10 @@ public StandardSyncOutput run(final JobRunConfig jobRunConfig, shouldRun = true; } if (!shouldRun) { - LOGGER.info("Skipping normalization because there are no records to normalize."); - continue; + LOGGER.info("No records to normalize detected"); + // Normalization skip has been disabled: issue #5417 + // LOGGER.info("Skipping normalization because there are no records to normalize."); + // continue; } } From d1d80fbf0f26fc1820f452950148ba9bb057bdce Mon Sep 17 00:00:00 2001 From: Jimmy Ma Date: Tue, 4 Oct 2022 11:23:39 -0700 Subject: [PATCH 2/2] Disable irrelevant tests --- .../java/io/airbyte/workers/temporal/sync/SyncWorkflowTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/temporal/sync/SyncWorkflowTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/temporal/sync/SyncWorkflowTest.java index ada9d6e567d2d..1e29735bc3167 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/temporal/sync/SyncWorkflowTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/temporal/sync/SyncWorkflowTest.java @@ -50,6 +50,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @SuppressWarnings({"PMD.UnusedPrivateField", "PMD.UnusedPrivateMethod"}) @@ -312,6 +313,7 @@ void testCancelDuringNormalization() { } @Test + @Disabled("This behavior has been disabled temporarily (OC Issue #741)") void testSkipNormalization() throws IOException { final SyncStats syncStats = new SyncStats().withRecordsCommitted(0L); final StandardSyncSummary standardSyncSummary = new StandardSyncSummary().withTotalStats(syncStats);