From 1d93817de61385b549c3f84ef8267846c821060c Mon Sep 17 00:00:00 2001 From: Davin Chia Date: Thu, 11 Aug 2022 20:01:03 -0700 Subject: [PATCH 1/2] Properly close the created database. --- .../io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java | 1 + .../io/airbyte/test/acceptance/AdvancedAcceptanceTests.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java index 333b264dfe381..c85f034e1a11a 100644 --- a/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java +++ b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java @@ -293,6 +293,7 @@ public void cleanup() { for (final UUID destinationId : destinationIds) { deleteDestination(destinationId); } + destinationPsql.stop(); } catch (final Exception e) { LOGGER.error("Error tearing down test fixtures:", e); } diff --git a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java index 35c0db1de9c57..87a9f67a0e09c 100644 --- a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java +++ b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java @@ -199,7 +199,9 @@ void testCheckpointing() throws Exception { // now cancel it so that we freeze state! try { apiClient.getJobsApi().cancelJob(new JobIdRequestBody().id(connectionSyncRead1.getJob().getId())); - } catch (final Exception e) {} + } catch (final Exception e) { + LOGGER.error("error:", e); + } final ConnectionState connectionState = waitForConnectionState(apiClient, connectionId); From 1453e27e00e7542409e47e85abacc08b10f15ef7 Mon Sep 17 00:00:00 2001 From: Davin Chia Date: Thu, 11 Aug 2022 21:14:54 -0700 Subject: [PATCH 2/2] Fix the hanging kube tests. --- kube/overlays/dev-integration-test/.env | 6 ++++++ kube/overlays/stable/.env | 1 + 2 files changed, 7 insertions(+) diff --git a/kube/overlays/dev-integration-test/.env b/kube/overlays/dev-integration-test/.env index 64612ea1aa4d4..ada7a851bf34d 100644 --- a/kube/overlays/dev-integration-test/.env +++ b/kube/overlays/dev-integration-test/.env @@ -54,6 +54,11 @@ JOB_MAIN_CONTAINER_CPU_LIMIT= JOB_MAIN_CONTAINER_MEMORY_REQUEST= JOB_MAIN_CONTAINER_MEMORY_LIMIT= +NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_LIMIT= +NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_REQUEST= +NORMALIZATION_JOB_MAIN_CONTAINER_CPU_LIMIT= +NORMALIZATION_JOB_MAIN_CONTAINER_CPU_REQUEST= + # Worker pod tolerations, annotations and node selectors JOB_KUBE_TOLERATIONS= JOB_KUBE_ANNOTATIONS= @@ -64,6 +69,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY= # Launch a separate pod to orchestrate sync steps CONTAINER_ORCHESTRATOR_ENABLED=true +CONTAINER_ORCHESTRATOR_IMAGE= # Open Telemetry Configuration METRIC_CLIENT= diff --git a/kube/overlays/stable/.env b/kube/overlays/stable/.env index e1b01c39f2704..a410638647ba4 100644 --- a/kube/overlays/stable/.env +++ b/kube/overlays/stable/.env @@ -71,6 +71,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY= # Launch a separate pod to orchestrate sync steps CONTAINER_ORCHESTRATOR_ENABLED=true +CONTAINER_ORCHESTRATOR_IMAGE= # Open Telemetry Configuration METRIC_CLIENT=