Re-org reset after backup (#10046)

Make sure that we don't call the update operation of the new scheduler if we are performing a reset operation with the new scheduler being activated.
airbytehq · Feb 3, 2022 · dadcf2d · dadcf2d
1 parent a938c4d
commit dadcf2d
Show file tree

Hide file tree

Showing 5 changed files with 553 additions and 476 deletions.
diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java
@@ -218,7 +218,8 @@ public ConfigurationApi(final ConfigRepository configRepository,
         schedulerHandler,
         operationsHandler,
         featureFlags,
-        temporalWorkerRunFactory);
+        temporalWorkerRunFactory,
+        connectionHelper);
     healthCheckHandler = new HealthCheckHandler();
     archiveHandler = new ArchiveHandler(
         airbyteVersion,

diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java
@@ -209,10 +209,17 @@ private Builder<String, Object> generateMetadata(final StandardSync standardSync
 
   public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate)
       throws ConfigNotFoundException, IOException, JsonValidationException {
+    return updateConnection(connectionUpdate, false);
+  }
+
+  public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate, boolean isAReset)
+      throws ConfigNotFoundException, IOException, JsonValidationException {
     if (featureFlags.usesNewScheduler()) {
       connectionHelper.updateConnection(connectionUpdate);
 
-      temporalWorkerRunFactory.update(connectionUpdate);
+      if (!isAReset) {
+        temporalWorkerRunFactory.update(connectionUpdate);
+      }
 
       return connectionHelper.buildConnectionRead(connectionUpdate.getConnectionId());
     }

diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java
@@ -45,6 +45,7 @@
 import io.airbyte.commons.lang.MoreBooleans;
 import io.airbyte.config.persistence.ConfigNotFoundException;
 import io.airbyte.validation.json.JsonValidationException;
+import io.airbyte.workers.helper.ConnectionHelper;
 import io.airbyte.workers.worker_run.TemporalWorkerRunFactory;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -71,6 +72,7 @@ public class WebBackendConnectionsHandler {
   private final OperationsHandler operationsHandler;
   private final FeatureFlags featureFlags;
   private final TemporalWorkerRunFactory temporalWorkerRunFactory;
+  private final ConnectionHelper connectionHelper;
 
   public WebBackendConnectionReadList webBackendListConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody)
       throws ConfigNotFoundException, IOException, JsonValidationException {
@@ -255,23 +257,31 @@ public WebBackendConnectionRead webBackendUpdateConnection(final WebBackendConne
       throws ConfigNotFoundException, IOException, JsonValidationException {
     final List<UUID> operationIds = updateOperations(webBackendConnectionUpdate);
     final ConnectionUpdate connectionUpdate = toConnectionUpdate(webBackendConnectionUpdate, operationIds);
-    final ConnectionRead connectionRead = connectionsHandler.updateConnection(connectionUpdate);
 
-    if (MoreBooleans.isTruthy(webBackendConnectionUpdate.getWithRefreshedCatalog())) {
-      final ConnectionIdRequestBody connectionId = new ConnectionIdRequestBody().connectionId(webBackendConnectionUpdate.getConnectionId());
-
-      if (featureFlags.usesNewScheduler()) {
-        temporalWorkerRunFactory.synchronousResetConnection(webBackendConnectionUpdate.getConnectionId());
-
-        temporalWorkerRunFactory.startNewManualSync(webBackendConnectionUpdate.getConnectionId());
-      } else {
+    ConnectionRead connectionRead;
+    boolean needReset = MoreBooleans.isTruthy(webBackendConnectionUpdate.getWithRefreshedCatalog());
+    if (!featureFlags.usesNewScheduler()) {
+      connectionRead = connectionsHandler.updateConnection(connectionUpdate);
+      if (needReset) {
+        final ConnectionIdRequestBody connectionId = new ConnectionIdRequestBody().connectionId(webBackendConnectionUpdate.getConnectionId());
         // wait for this to execute
         schedulerHandler.resetConnection(connectionId);
 
         // just create the job
         schedulerHandler.syncConnection(connectionId);
       }
+    } else {
+      connectionRead = connectionsHandler.updateConnection(connectionUpdate, !needReset);
+
+      if (needReset) {
+        temporalWorkerRunFactory.synchronousResetConnection(webBackendConnectionUpdate.getConnectionId());
+
+        temporalWorkerRunFactory.startNewManualSync(webBackendConnectionUpdate.getConnectionId());
+
+        connectionRead = connectionHelper.buildConnectionRead(connectionUpdate.getConnectionId());
+      }
     }
+
     return buildWebBackendConnectionRead(connectionRead);
   }