Bmoric/temporal cleaning cron #16414
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| datasources: | ||
| config: | ||
| connection-test-query: SELECT 1 | ||
| connection-timeout: 30000 | ||
| idle-timeout: 600000 | ||
| maximum-pool-size: 10 | ||
| url: ${DATABASE_URL} | ||
| driverClassName: org.postgresql.Driver | ||
| username: ${DATABASE_USER} | ||
| password: ${DATABASE_PASSWORD} | ||
| jobs: | ||
| connection-test-query: SELECT 1 | ||
| connection-timeout: 30000 | ||
| idle-timeout: 600000 | ||
| maximum-pool-size: 10 | ||
| url: ${DATABASE_URL} | ||
| driverClassName: org.postgresql.Driver | ||
| username: ${DATABASE_USER} | ||
| password: ${DATABASE_PASSWORD} | ||
|
|
||
| flyway: | ||
| enabled: true | ||
| datasources: | ||
| config: | ||
| enabled: false | ||
| locations: | ||
| - 'classpath:io/airbyte/db/instance/configs/migrations' | ||
| jobs: | ||
| enabled: false | ||
| locations: | ||
| - 'classpath:io/airbyte/db/instance/jobs/migrations' | ||
|
|
||
| jooq: | ||
| datasources: | ||
| config: | ||
| jackson-converter-enabled: true | ||
| sql-dialect: POSTGRES | ||
| jobs: | ||
| jackson-converter-enabled: true | ||
| sql-dialect: POSTGRES | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| micronaut: | ||
| application: | ||
| name: airbyte-workers | ||
| security: | ||
| intercept-url-map: | ||
| - pattern: /** | ||
| httpMethod: GET | ||
| access: | ||
| - isAnonymous() | ||
| server: | ||
| port: 9000 | ||
|
|
||
| airbyte: | ||
|
There was a problem hiding this comment. I am a bit confused about this part. It looks like we are starting to duplicate configs and a lot of the keys here feel irrelevant to the There was a problem hiding this comment. @gosusnp Agreed. We shouldn't need the full config from the There was a problem hiding this comment. @jdpgrailsdev @gosusnp I answered it here: #16414 (comment) I will bring it to the sit and work. |
||
| activity: | ||
| initial-delay: ${ACTIVITY_INITIAL_DELAY_BETWEEN_ATTEMPTS_SECONDS:30} | ||
| max-attempts: ${ACTIVITY_MAX_ATTEMPT:5} | ||
| max-delay: ${ACTIVITY_MAX_DELAY_BETWEEN_ATTEMPTS_SECONDS:600} | ||
| max-timeout: ${ACTIVITY_MAX_TIMEOUT_SECOND:120} | ||
| cloud: | ||
| storage: | ||
| logs: | ||
| type: ${WORKER_LOGS_STORAGE_TYPE:} | ||
| gcs: | ||
| application-credentials: ${GOOGLE_APPLICATION_CREDENTIALS:} | ||
| bucket: ${GCS_LOG_BUCKET:} | ||
| minio: | ||
| access-key: ${AWS_ACCESS_KEY_ID:} | ||
| bucket: ${S3_LOG_BUCKET:} | ||
| endpoint: ${S3_MINIO_ENDPOINT:} | ||
| secret-access-key: ${AWS_SECRET_ACCESS_KEY:} | ||
| s3: | ||
| access-key: ${AWS_ACCESS_KEY_ID:} | ||
| bucket: ${S3_LOG_BUCKET:} | ||
| region: ${S3_LOG_BUCKET_REGION:} | ||
| secret-access-key: ${AWS_SECRET_ACCESS_KEY:} | ||
| state: | ||
| type: ${WORKER_STATE_STORAGE_TYPE:} | ||
| gcs: | ||
| application-credentials: ${STATE_STORAGE_GCS_APPLICATION_CREDENTIALS:} | ||
| bucket: ${STATE_STORAGE_GCS_BUCKET_NAME:} | ||
| minio: | ||
| access-key: ${STATE_STORAGE_MINIO_ACCESS_KEY:} | ||
| bucket: ${STATE_STORAGE_MINIO_BUCKET_NAME:} | ||
| endpoint: ${STATE_STORAGE_MINIO_ENDPOINT:} | ||
| secret-access-key: ${STATE_STORAGE_MINIO_SECRET_ACCESS_KEY:} | ||
| s3: | ||
| access-key: ${STATE_STORAGE_S3_ACCESS_KEY:} | ||
| bucket: ${STATE_STORAGE_S3_BUCKET_NAME:} | ||
| region: ${STATE_STORAGE_S3_BUCKET_REGION:} | ||
| secret-access-key: ${STATE_STORAGE_S3_SECRET_ACCESS_KEY:} | ||
| connector: | ||
| specific-resource-defaults-enabled: ${CONNECTOR_SPECIFIC_RESOURCE_DEFAULTS_ENABLED:false} | ||
| container: | ||
| orchestrator: | ||
| enabled: ${CONTAINER_ORCHESTRATOR_ENABLED:false} | ||
| image: ${CONTAINER_ORCHESTRATOR_IMAGE:} | ||
| secret-mount-path: ${CONTAINER_ORCHESTRATOR_SECRET_MOUNT_PATH:} | ||
| secret-name: ${CONTAINER_ORCHESTRATOR_SECRET_NAME:} | ||
| control: | ||
| plane: | ||
| auth-endpoint: ${CONTROL_PLANE_AUTH_ENDPOINT:} | ||
| data: | ||
| sync: | ||
| task-queue: ${DATA_SYNC_TASK_QUEUES:SYNC} | ||
| plane: | ||
| connection-ids-mvp: ${CONNECTION_IDS_FOR_MVP_DATA_PLANE:} | ||
| service-account: | ||
| credentials-path: ${DATA_PLANE_SERVICE_ACCOUNT_CREDENTIALS_PATH:} | ||
| email: ${DATA_PLANE_SERVICE_ACCOUNT_EMAIL:} | ||
| deployment-mode: ${DEPLOYMENT_MODE:OSS} | ||
| flyway: | ||
| configs: | ||
| initialization-timeout-ms: ${CONFIGS_DATABASE_INITIALIZATION_TIMEOUT_MS:60000} | ||
| minimum-migration-version: ${CONFIGS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION} | ||
| jobs: | ||
| initialization-timeout-ms: ${JOBS_DATABASE_INITIALIZATION_TIMEOUT_MS:60000} | ||
| minimum-migration-version: ${JOBS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION} | ||
| internal: | ||
| api: | ||
| auth-header: | ||
| name: ${AIRBYTE_API_AUTH_HEADER_NAME:} | ||
| value: ${AIRBYTE_API_AUTH_HEADER_VALUE:} | ||
| host: ${INTERNAL_API_HOST} | ||
| local: | ||
| docker-mount: ${LOCAL_DOCKER_MOUNT} | ||
| root: ${LOCAL_ROOT} | ||
| worker: | ||
| env: ${WORKER_ENVIRONMENT:DOCKER} | ||
| check: | ||
| enabled: ${SHOULD_RUN_CHECK_CONNECTION_WORKFLOWS:true} | ||
| kube: | ||
| annotations: ${CHECK_JOB_KUBE_ANNOTATION:} | ||
| node-selectors: ${CHECK_JOB_KUBE_NODE_SELECTORS:} | ||
| max-workers: ${MAX_CHECK_WORKERS:5} | ||
| main: | ||
| container: | ||
| cpu: | ||
| limit: ${CHECK_JOB_MAIN_CONTAINER_CPU_LIMIT:} | ||
| request: ${CHECK_JOB_MAIN_CONTAINER_CPU_REQUEST:} | ||
| memory: | ||
| limit: ${CHECK_JOB_MAIN_CONTAINER_MEMORY_LIMIT:} | ||
| request: ${CHECK_JOB_MAIN_CONTAINER_MEMORY_REQUEST:} | ||
| connection: | ||
| enabled: ${SHOULD_RUN_CONNECTION_MANAGER_WORKFLOWS:true} | ||
| discover: | ||
| enabled: ${SHOULD_RUN_DISCOVER_WORKFLOWS:true} | ||
| kube: | ||
| annotations: ${DISCOVER_JOB_KUBE_ANNOTATIONS:} | ||
| node-selectors: ${DISCOVER_JOB_KUBE_NODE_SELECTORS:} | ||
| max-workers: ${MAX_DISCOVER_WORKERS:5} | ||
| job: | ||
| error-reporting: | ||
| sentry: | ||
| dsn: ${JOB_ERROR_REPORTING_SENTRY_DSN} | ||
| strategy: ${JOB_ERROR_REPORTING_STRATEGY:LOGGING} | ||
| failed: | ||
| max-days: ${MAX_DAYS_OF_ONLY_FAILED_JOBS_BEFORE_CONNECTION_DISABLE:14} | ||
| max-jobs: ${MAX_FAILED_JOBS_IN_A_ROW_BEFORE_CONNECTION_DISABLE:100} | ||
| kube: | ||
| annotations: ${JOB_KUBE_ANNOTATIONS:} | ||
| images: | ||
| busybox: ${JOB_KUBE_BUSYBOX_IMAGE:`busybox:1.28`} | ||
| curl: ${JOB_KUBE_CURL_IMAGE:`curlimages/curl:7.83.1`} | ||
| socat: ${JOB_KUBE_SOCAT_IMAGE:`alpine/socat:1.7.4.3-r0`} | ||
| main: | ||
| container: | ||
| image-pull-policy: ${JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY:IfNotPresent} | ||
| image-pull-secret: ${JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET:} | ||
| namespace: ${JOB_KUBE_NAMESPACE:default} | ||
| node-selectors: ${JOB_KUBE_NODE_SELECTORS:} | ||
| sidecar: | ||
| container: | ||
| image-pull-policy: ${JOB_KUBE_SIDECAR_CONTAINER_IMAGE_PULL_POLICY:IfNotPresent} | ||
| tolerations: ${JOB_KUBE_TOLERATIONS:} | ||
| main: | ||
| container: | ||
| cpu: | ||
| limit: ${JOB_MAIN_CONTAINER_CPU_LIMIT:} | ||
| request: ${JOB_MAIN_CONTAINER_CPU_REQUEST:} | ||
| memory: | ||
| limit: ${JOB_MAIN_CONTAINER_MEMORY_LIMIT:} | ||
| request: ${JOB_MAIN_CONTAINER_MEMORY_REQUEST:} | ||
| normalization: | ||
| main: | ||
| container: | ||
| cpu: | ||
| limit: ${NORMALIZATION_JOB_MAIN_CONTAINER_CPU_LIMIT:} | ||
| request: ${NORMALIZATION_JOB_MAIN_CONTAINER_CPU_REQUEST:} | ||
| memory: | ||
| limit: ${NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_LIMIT:} | ||
| request: ${NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_REQUEST:} | ||
| plane: ${WORKER_PLANE:CONTROL_PLANE} | ||
| replication: | ||
| orchestrator: | ||
| cpu: | ||
| limit: ${REPLICATION_ORCHESTRATOR_CPU_LIMIT:} | ||
| request: ${REPLICATION_ORCHESTRATOR_CPU_REQUEST:} | ||
| memory: | ||
| limit: ${REPLICATION_ORCHESTRATOR_MEMORY_LIMIT:} | ||
| request: ${REPLICATION_ORCHESTRATOR_MEMORY_REQUEST:} | ||
| spec: | ||
| enabled: ${SHOULD_RUN_GET_SPEC_WORKFLOWS:true} | ||
| kube: | ||
| annotations: ${SPEC_JOB_KUBE_ANNOTATIONS:} | ||
| node-selectors: ${SPEC_JOB_KUBE_NODE_SELECTORS:} | ||
| max-workers: ${MAX_SPEC_WORKERS:5} | ||
| sync: | ||
| enabled: ${SHOULD_RUN_SYNC_WORKFLOWS:true} | ||
| max-workers: ${MAX_SYNC_WORKERS:5} | ||
| max-attempts: ${SYNC_JOB_MAX_ATTEMPTS:3} | ||
| max-timeout: ${SYNC_JOB_MAX_TIMEOUT_DAYS:3} | ||
| role: ${AIRBYTE_ROLE:} | ||
| secret: | ||
| persistence: ${SECRET_PERSISTENCE:TESTING_CONFIG_DB_TABLE} | ||
| store: | ||
| gcp: | ||
| credentials: ${SECRET_STORE_GCP_CREDENTIALS:} | ||
| project-id: ${SECRET_STORE_GCP_PROJECT_ID:} | ||
| vault: | ||
| address: ${VAULT_ADDRESS:} | ||
| prefix: ${VAULT_PREFIX:} | ||
| token: ${VAULT_AUTH_TOKEN:} | ||
| temporal: | ||
| worker: | ||
| ports: ${TEMPORAL_WORKER_PORTS:} | ||
| tracking-strategy: ${TRACKING_STRATEGY:LOGGING} | ||
| version: ${AIRBYTE_VERSION} | ||
| web-app: | ||
| url: ${WEBAPP_URL:} | ||
| workflow: | ||
| failure: | ||
| restart-delay: ${WORKFLOW_FAILURE_RESTART_DELAY_SECONDS:600} | ||
| workspace: | ||
| docker-mount: ${WORKSPACE_DOCKER_MOUNT:} | ||
| root: ${WORKSPACE_ROOT} | ||
|
|
||
| docker: | ||
| network: ${DOCKER_NETWORK:host} | ||
|
|
||
| endpoints: | ||
| all: | ||
| enabled: true | ||
|
|
||
| temporal: | ||
| cloud: | ||
| client: | ||
| cert: ${TEMPORAL_CLOUD_CLIENT_CERT:} | ||
| key: ${TEMPORAL_CLOUD_CLIENT_KEY:} | ||
| enabled: ${TEMPORAL_CLOUD_ENABLED:false} | ||
| host: ${TEMPORAL_CLOUD_HOST:} | ||
| namespace: ${TEMPORAL_CLOUD_NAMESPACE:} | ||
| host: ${TEMPORAL_HOST:`airbyte-temporal:7233`} | ||
| retention: ${TEMPORAL_HISTORY_RETENTION_IN_DAYS:30} | ||
|
|
||
| logger: | ||
| levels: | ||
| io.airbyte.bootloader: DEBUG | ||
| # Uncomment to help resolve issues with conditional beans | ||
| # io.micronaut.context.condition: DEBUG | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We shouldn't need this file in the cron service.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue here is that all the Beans are being initiated because the cron module depends on the worker one which has all the beans being declared.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The eager initiation was set to true, I am removing it and will try to clean this list. Unfortunately we will need more config than what we thought.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah...this is because we depend on
airbyte-workers. That causes Micronaut to find all singletons. The solution, ultimately, is to extract the shared code to a library module that both can depend on.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We sync up with @gosusnp and discover that we have ApplicationInitializer. I think that the best way to do it is to have the cron module to not depends on the worker module. I will try to extract the temporal client from it in another PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@benmoriceau Agreed...that is the best course here. It will cause some conflict with the airbyte-workers Micronaut PR, but if you are able to extract and get that merged first, I can easily update the PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jdpgrailsdev After merging and merging the extraction of the TemporalClient, I'll clean this file.