From 0bcb9c81215b16afd9f0ff58202adb738d6d60b1 Mon Sep 17 00:00:00 2001 From: lmossman Date: Fri, 11 Feb 2022 15:37:41 -0800 Subject: [PATCH 1/4] do not wipe out existing connection resource requirements on update --- .../workers/helper/ConnectionHelper.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java index 07a4f91691de..835b3cc72274 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java @@ -22,12 +22,16 @@ import io.airbyte.workers.WorkerConfigs; import java.io.IOException; import java.util.HashSet; +import java.util.Optional; import java.util.Set; import java.util.UUID; import lombok.AllArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @AllArgsConstructor public class ConnectionHelper { + private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionHelper.class); private final ConfigRepository configRepository; private final WorkspaceHelper workspaceHelper; @@ -74,7 +78,21 @@ public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate) .withMemoryRequest(connectionUpdate.getResourceRequirements().getMemoryRequest()) .withMemoryLimit(connectionUpdate.getResourceRequirements().getMemoryLimit())); } else { - newConnection.withResourceRequirements(workerConfigs.getResourceRequirements()); + final io.airbyte.config.ResourceRequirements resourceRequirements = Optional.ofNullable(persistedSync.getResourceRequirements()) + .orElse(new io.airbyte.config.ResourceRequirements()); + if (resourceRequirements.getCpuRequest() == null) { + resourceRequirements.setCpuRequest(workerConfigs.getResourceRequirements().getCpuRequest()); + } + if (resourceRequirements.getCpuLimit() == null) { + resourceRequirements.setCpuLimit(workerConfigs.getResourceRequirements().getCpuLimit()); + } + if (resourceRequirements.getMemoryRequest() == null) { + resourceRequirements.setMemoryRequest(workerConfigs.getResourceRequirements().getMemoryRequest()); + } + if (resourceRequirements.getMemoryLimit() == null) { + resourceRequirements.setMemoryLimit(workerConfigs.getResourceRequirements().getMemoryLimit()); + } + newConnection.withResourceRequirements(resourceRequirements); } // update sync schedule From 2db2d6333f5a6e30fed74b6e696d6a538b5315f5 Mon Sep 17 00:00:00 2001 From: lmossman Date: Fri, 11 Feb 2022 15:43:01 -0800 Subject: [PATCH 2/4] format --- .../main/java/io/airbyte/workers/helper/ConnectionHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java index 835b3cc72274..89353ffd1f87 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java @@ -31,6 +31,7 @@ @AllArgsConstructor public class ConnectionHelper { + private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionHelper.class); private final ConfigRepository configRepository; From db441a71216efc66bf07704ea94652aa7d907572 Mon Sep 17 00:00:00 2001 From: lmossman Date: Fri, 11 Feb 2022 15:53:53 -0800 Subject: [PATCH 3/4] do not pull any values from worker configs here --- .../airbyte/workers/helper/ConnectionHelper.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java index 89353ffd1f87..729b573332b1 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java @@ -79,21 +79,7 @@ public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate) .withMemoryRequest(connectionUpdate.getResourceRequirements().getMemoryRequest()) .withMemoryLimit(connectionUpdate.getResourceRequirements().getMemoryLimit())); } else { - final io.airbyte.config.ResourceRequirements resourceRequirements = Optional.ofNullable(persistedSync.getResourceRequirements()) - .orElse(new io.airbyte.config.ResourceRequirements()); - if (resourceRequirements.getCpuRequest() == null) { - resourceRequirements.setCpuRequest(workerConfigs.getResourceRequirements().getCpuRequest()); - } - if (resourceRequirements.getCpuLimit() == null) { - resourceRequirements.setCpuLimit(workerConfigs.getResourceRequirements().getCpuLimit()); - } - if (resourceRequirements.getMemoryRequest() == null) { - resourceRequirements.setMemoryRequest(workerConfigs.getResourceRequirements().getMemoryRequest()); - } - if (resourceRequirements.getMemoryLimit() == null) { - resourceRequirements.setMemoryLimit(workerConfigs.getResourceRequirements().getMemoryLimit()); - } - newConnection.withResourceRequirements(resourceRequirements); + newConnection.withResourceRequirements(persistedSync.getResourceRequirements()); } // update sync schedule From c4f8432c5e858bbc04d8544f923fdc13393fa4e1 Mon Sep 17 00:00:00 2001 From: lmossman Date: Fri, 11 Feb 2022 15:54:55 -0800 Subject: [PATCH 4/4] remove logger --- .../java/io/airbyte/workers/helper/ConnectionHelper.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java index 729b573332b1..f77ff88d4896 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java @@ -22,18 +22,13 @@ import io.airbyte.workers.WorkerConfigs; import java.io.IOException; import java.util.HashSet; -import java.util.Optional; import java.util.Set; import java.util.UUID; import lombok.AllArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @AllArgsConstructor public class ConnectionHelper { - private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionHelper.class); - private final ConfigRepository configRepository; private final WorkspaceHelper workspaceHelper; private final WorkerConfigs workerConfigs;