Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bmoric/restore update with temporal #10713

Merged
merged 4 commits into from
Feb 28, 2022
Merged

Bmoric/restore update with temporal #10713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7529500
Restore the temporal update call
benmoriceau Feb 25, 2022
dececd2
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/res…
benmoriceau Feb 28, 2022
c9f14c9
Add test
benmoriceau Feb 28, 2022
a743383
Update webbackend test
benmoriceau Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate)
new HashSet<>(connectionUpdate.getOperationIds()));

configRepository.writeStandardSync(newConnection);

if (featureFlags.usesNewScheduler()) {
temporalWorkerRunFactory.update(connectionUpdate);
}

return buildConnectionRead(connectionUpdate.getConnectionId());
}

Expand Down
2 changes: 0 additions & 2 deletions airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ public WebBackendConnectionRead webBackendUpdateConnection(final WebBackendConne
connectionRead = connectionsHandler.updateConnection(connectionUpdate);

if (needReset) {
// todo (cgardens) - temporalWorkerRunFactory CANNOT be here.
temporalWorkerRunFactory.update(connectionUpdate);

// todo (cgardens) - temporalWorkerRunFactory CANNOT be here.
temporalWorkerRunFactory.synchronousResetConnection(webBackendConnectionUpdate.getConnectionId());
Expand Down
14 changes: 12 additions & 2 deletions airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

class ConnectionsHandlerTest {

Expand Down Expand Up @@ -293,8 +295,12 @@ void testCreateConnectionWithBadDefinitionIds() throws JsonValidationException,

}

@Test
void testUpdateConnection() throws JsonValidationException, ConfigNotFoundException, IOException {
@ParameterizedTest
@ValueSource(booleans = {true, false})
void testUpdateConnection(boolean useNewScheduler) throws JsonValidationException, ConfigNotFoundException, IOException {
when(featureFlags.usesNewScheduler())
.thenReturn(useNewScheduler);

final AirbyteCatalog catalog = ConnectionHelpers.generateBasicApiCatalog();
catalog.getStreams().get(0).getStream().setName("azkaban_users");
catalog.getStreams().get(0).getConfig().setAliasName("azkaban_users");
Expand Down Expand Up @@ -349,6 +355,10 @@ void testUpdateConnection() throws JsonValidationException, ConfigNotFoundExcept
assertEquals(expectedConnectionRead, actualConnectionRead);

verify(configRepository).writeStandardSync(updatedStandardSync);

if (useNewScheduler) {
verify(temporalWorkflowHandler).update(connectionUpdate);
}
}

@Test
Expand Down
1 change: 1 addition & 0 deletions ...yte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ void testUpdateConnectionWithUpdatedSchemaNewScheduler() throws JsonValidationEx
final ConnectionIdRequestBody connectionId = new ConnectionIdRequestBody().connectionId(result.getConnectionId());
verify(schedulerHandler, times(0)).resetConnection(connectionId);
verify(schedulerHandler, times(0)).syncConnection(connectionId);
verify(connectionsHandler, times(1)).updateConnection(any());
final InOrder orderVerifier = inOrder(temporalWorkerRunFactory);
orderVerifier.verify(temporalWorkerRunFactory, times(1)).synchronousResetConnection(connectionId.getConnectionId());
orderVerifier.verify(temporalWorkerRunFactory, times(1)).startNewManualSync(connectionId.getConnectionId());
Expand Down