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

Performance: Inject Socat CPU resources into the Orchestrator. #22288

Merged
merged 2 commits into from
Feb 2, 2023
Merged

Performance: Inject Socat CPU resources into the Orchestrator. #22288

merged 2 commits into from
Feb 2, 2023

Conversation

davinchia
Copy link
Contributor

@davinchia davinchia commented Feb 2, 2023 •
edited
Loading

What

Performance testing shows that Socat needs more than 1 CPU to get to a higher throughput. This PR lets us propagate env vars on the worker onto the orchestrator and the connector pods it creates.

How

  • Modify the worker so that the orchestrator is created with Socat CPU resource vars.
  • Modify the orchestrator injection mechanism so via the WorkerConfigs so it retrieves the Socat CPU vars from the env and passes it to the Kube Process Factory.

All this is very ugly and hacky. This entire mechanism needs to be simplified. I am ignoring that now for the purposes of performance work.

Recommended reading order

  1. ContainerOrchestratorConfigBeanFactory.java - injects the env var onto the Orchestrator.
  2. AirbyteIntegrationLauncher.java - pulls in the env var while creating connector pods.

🚨 User Impact 🚨

Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the connector is published, connector added to connector index as described here
  • Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here
Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub and connector version bumped by running the /publish command described here
Connector Generator
  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed

@octavia-squidington-iii octavia-squidington-iii added area/platform issues related to the platform area/worker Related to worker labels Feb 2, 2023
@davinchia davinchia changed the title Davinchia/container orchestrator cpu limits Inject Socat CPU resources into the Orchestrator. Feb 2, 2023
@davinchia davinchia temporarily deployed to more-secrets February 2, 2023 01:19 — with GitHub Actions Inactive
@davinchia davinchia temporarily deployed to more-secrets February 2, 2023 01:19 — with GitHub Actions Inactive
@davinchia davinchia changed the title Inject Socat CPU resources into the Orchestrator. Performance: Inject Socat CPU resources into the Orchestrator. Feb 2, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Feb 2, 2023

Airbyte Code Coverage

File Coverage [66.84%] 🍏
AirbyteIntegrationLauncher.java 100% 🍏
ContainerOrchestratorConfigBeanFactory.java 0% ❌
Total Project Coverage 24.53% ❌

@davinchia davinchia temporarily deployed to more-secrets February 2, 2023 03:11 — with GitHub Actions Inactive
@davinchia davinchia temporarily deployed to more-secrets February 2, 2023 03:11 — with GitHub Actions Inactive
@davinchia davinchia marked this pull request as ready for review February 2, 2023 03:44
davinchia
davinchia commented Feb 2, 2023
View reviewed changes
airbyte-commons-worker/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java
return Map.of(
WorkerEnvConstants.WORKER_CONNECTOR_IMAGE, imageName,
WorkerEnvConstants.WORKER_JOB_ID, jobId,
WorkerEnvConstants.WORKER_JOB_ATTEMPT, String.valueOf(attempt),
EnvVariableFeatureFlags.USE_STREAM_CAPABLE_STATE, String.valueOf(featureFlags.useStreamCapableState()),
EnvVariableFeatureFlags.AUTO_DETECT_SCHEMA, String.valueOf(featureFlags.autoDetectSchema()),
EnvVariableFeatureFlags.APPLY_FIELD_SELECTION, String.valueOf(featureFlags.applyFieldSelection()),
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES, featureFlags.fieldSelectionWorkspaces());
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES, featureFlags.fieldSelectionWorkspaces(),
EnvConfigs.SOCAT_KUBE_CPU_LIMIT, configs.getSocatSidecarKubeCpuLimit(),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@colesnodgrass @jdpgrailsdev this is ugly, however will merge this in now to test this thesis in Prod.

As per https://airbytehq-team.slack.com/archives/C048E3BK1KM/p1675296979397189?thread_ts=1675225255.388719&cid=C048E3BK1KM we need to rewrite this however not going to do this now.

@davinchia davinchia merged commit bb7af73 into master Feb 2, 2023
@davinchia davinchia deleted the davinchia/container-orchestrator-cpu-limits branch February 2, 2023 03:47
@octavia-squidington-iii octavia-squidington-iii mentioned this pull request Feb 2, 2023
Closed
@github-actions github-actions bot mentioned this pull request Feb 7, 2023
Closed
This was referenced Feb 8, 2023
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/platform issues related to the platform area/worker Related to worker
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@davinchia @octavia-squidington-iii