pkgpush lambda: increase read timeout for s3hash lambda invocation (#…

…2933)
quiltdata · Jul 6, 2022 · 5f2ec40 · 5f2ec40
1 parent 8c2e6ae
commit 5f2ec40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -19,6 +19,7 @@
 * [Added] Admin: new roles and policies UI ([#2819](https://github.com/quiltdata/quilt/pull/2819))
 * [Added] Deep search indexing for .pptx ([#2881](https://github.com/quiltdata/quilt/pull/2881))
 * [Fixed] Fix package creation in S3 buckets with SSE-KMS enabled ([#2754](https://github.com/quiltdata/quilt/pull/2754))
+* [Fixed] Fix creation of packages with large (4+ GiB) files ([#2933](https://github.com/quiltdata/quilt/pull/2933))
 * [Changed] Clean up home page ([#2780](https://github.com/quiltdata/quilt/pull/2780)).
 * [Changed] Make `pkgpush` lambda directly invocable, adjust handling of parameters and errors ([#2776](https://github.com/quiltdata/quilt/pull/2776))
 * [Changed] Push packages via GraphQL ([#2768](https://github.com/quiltdata/quilt/pull/2768))

diff --git a/lambdas/pkgpush/src/t4_lambda_pkgpush/__init__.py b/lambdas/pkgpush/src/t4_lambda_pkgpush/__init__.py
@@ -36,6 +36,7 @@
 S3_HASH_LAMBDA_MAX_FILE_SIZE_BYTES = int(os.environ['S3_HASH_LAMBDA_MAX_FILE_SIZE_BYTES'])
 
 S3_HASH_LAMBDA_SIGNED_URL_EXPIRES_IN_SECONDS = 15 * 60  # Max lambda duration.
+S3_HASH_LAMBDA_READ_TIMEOUT = S3_HASH_LAMBDA_SIGNED_URL_EXPIRES_IN_SECONDS
 
 SERVICE_BUCKET = os.environ['SERVICE_BUCKET']
 
@@ -185,7 +186,7 @@
 
 
 s3 = boto3.client('s3')
-lambda_ = boto3.client('lambda')
+lambda_ = boto3.client('lambda', config=botocore.client.Config(read_timeout=S3_HASH_LAMBDA_READ_TIMEOUT))
 
 
 # Monkey patch quilt3 S3ClientProvider, so it builds a client using user credentials.