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.

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

CUMULUS-3940 -- Forward port to main #3878

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

Jkovarik
Copy link
Member

Summary: Summary of changes

Addresses CUMULUS-3940

Changes

Forward port of #3877 - see discussion in port

PR Checklist

  • Update CHANGELOG
  • Unit tests
  • Ad-hoc testing - Deploy changes and test manually
  • Integration tests

This commit updates the following:

- esClient is properly passed through api lambda/lib methods such that
  write granules calls from process-s3-dead-letter-archive can pass in
  an instance of EsClient rather than relying on default
  per-granule object/client behavior
- The API endpoint and related code are updated such that maxDbPool,
  concurrency and batchSize are exposed as endpoint options, allowing
  user customization of tuning behavior for the DLA recovery tool
- Minor typing/call fixes
This commit updates:

- archive/cumulus/example to pass through memory
configuration options to the fargate task definition
const asyncOperation = await asyncOperations.startAsyncOperation({
cluster: process.env.EcsCluster,
callerLambdaName: getFunctionNameFromRequestContext(req),
lambdaName: process.env.DeadLetterProcessingLambda,
asyncOperationTaskDefinition: process.env.AsyncOperationTaskDefinition,
asyncOperationTaskDefinition: process.env.DeadLetterRecoveryTaskDefinition,
Copy link
Contributor

Choose a reason for hiding this comment

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

so this is our async task definition but using "not the same definition as general async operations" right?

path,
},
stackName,
systemBucket,
knexConfig: process.env,
knexConfig: { ...process.env, maxDbPool },
Copy link
Contributor

Choose a reason for hiding this comment

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

why isn't maxDbPool being gotten originally from the environment? I note that further down in tests it's being configured as an environment variable

cumulusMessage,
collectionCumulusId,
providerCumulusId,
knex,
executionCumulusId,
esClient,
});

return writeGranulesFromMessage({
Copy link
Contributor

Choose a reason for hiding this comment

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

are we certain this works? I don't see a change to "writeGranulesFromMessage" that uses an esclient argument, either In the changes here or in the master branch code

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants