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

Extract split the server into 2 modules #21736

Merged
merged 9 commits into from
Jan 24, 2023
Merged

Extract split the server into 2 modules #21736

merged 9 commits into from
Jan 24, 2023

Conversation

benmoriceau
Copy link
Contributor

@benmoriceau benmoriceau commented Jan 23, 2023 •
edited
Loading

What

Isolate the micronaut application of the server. No other module will need to to depends on the server.

This will break cloud build and OSS need to be bump once this is merged

How

Move the common class of the server to a common module.
Everything is moved except:

  • The micronaut controller (api module)
  • the micronaut factories (config module)
  • The request handlers and mappers (errors module), the exceptions themself are moved to the common module.

Related issue: #21732

@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 19:02 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 19:02 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 19:48 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 19:48 — with GitHub Actions Inactive
@octavia-squidington-iv octavia-squidington-iv added area/platform issues related to the platform area/server labels Jan 23, 2023
@benmoriceau benmoriceau changed the title tmp Extract split the server into 2 modules Jan 23, 2023
@benmoriceau benmoriceau marked this pull request as ready for review January 23, 2023 22:04
@benmoriceau benmoriceau requested a review from a team as a code owner January 23, 2023 22:04
@benmoriceau benmoriceau requested a review from a team January 23, 2023 22:04
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 22:29 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 22:29 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 22:35 — with GitHub Actions Inactive
benmoriceau
benmoriceau commented Jan 23, 2023
View reviewed changes
gradle.properties
@@ -3,7 +3,7 @@

org.gradle.parallel=true

org.gradle.jvmargs=-Xmx4g -Xss4m
org.gradle.jvmargs=-Xmx8g -Xss4m
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was needed to make gradle to be able to import the new module

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very strange. It seems odd that just moving the code to a library would cause Gradle to need more memory. We should probably look into this a bit, because needing 8 GB to build the server seems like that may be an issue for OSS users.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, I ran into java heap memory issue. I cleaned the cache which didn't work then re-clone the project which ran into the same issue, it was the only way I found to include the new module. I haven't tried with a lower memory setting.

@github-actions
Copy link
Contributor

github-actions bot commented Jan 23, 2023 •
edited
Loading

Airbyte Code Coverage

File Coverage [0.47%] ❌
HealthApiController.java 100% 🍏
ServerFactory.java 0% ❌
ServerApp.java 0% ❌
ApplicationBeanFactory.java 0% ❌
TemporalBeanFactory.java 0% ❌
JobsApiController.java 0% ❌
StateApiController.java 0% ❌
SourceApiController.java 0% ❌
SourceDefinitionSpecificationApiController.java 0% ❌
DestinationDefinitionApiController.java 0% ❌
NotificationsApiController.java 0% ❌
ApiHelper.java 0% ❌
WorkspaceApiController.java 0% ❌
DestinationApiController.java 0% ❌
SourceOauthApiController.java 0% ❌
SchedulerApiController.java 0% ❌
OperationApiController.java 0% ❌
DestinationOauthApiController.java 0% ❌
AttemptApiController.java 0% ❌
OpenapiApiController.java 0% ❌
DestinationDefinitionSpecificationApiController.java 0% ❌
LogsApiController.java 0% ❌
SourceDefinitionApiController.java 0% ❌
ConnectionApiController.java 0% ❌
WebBackendApiController.java 0% ❌
InvalidInputExceptionHandler.java 0% ❌
InvalidJsonInputExceptionHandler.java 0% ❌
NotFoundExceptionHandler.java 0% ❌
UncaughtExceptionHandler.java 0% ❌
KnownExceptionHandler.java 0% ❌
InvalidJsonExceptionHandler.java 0% ❌
Total Project Coverage 23.94% ❌

@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 22:52 — with GitHub Actions Inactive
@benmoriceau
Copy link
Contributor Author

https://github.com/airbytehq/airbyte-cloud/pull/4161 => Cloud PR

@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 23:45 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 23:45 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 23:46 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 23:53 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 23:53 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 23, 2023 23:53 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 24, 2023 00:19 — with GitHub Actions Inactive
@benmoriceau benmoriceau temporarily deployed to more-secrets January 24, 2023 00:19 — with GitHub Actions Inactive
jdpgrailsdev
jdpgrailsdev approved these changes Jan 24, 2023
View reviewed changes
Copy link
Contributor

@jdpgrailsdev jdpgrailsdev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@benmoriceau benmoriceau merged commit 0b97ce3 into master Jan 24, 2023
@benmoriceau benmoriceau deleted the bmoric/split-server branch January 24, 2023 15:51
@github-actions github-actions bot mentioned this pull request Jan 24, 2023
Closed
This was referenced Jan 27, 2023
Closed
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdpgrailsdev jdpgrailsdev jdpgrailsdev approved these changes

@terencecho terencecho Awaiting requested review from terencecho

@gosusnp gosusnp Awaiting requested review from gosusnp

@colesnodgrass colesnodgrass Awaiting requested review from colesnodgrass

@alovew alovew Awaiting requested review from alovew

@JonsSpaghetti JonsSpaghetti Awaiting requested review from JonsSpaghetti

Assignees
No one assigned
Labels
area/platform issues related to the platform area/server
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@benmoriceau @jdpgrailsdev @octavia-squidington-iv