diff --git a/.github/workflows/temp-branch-build-and-push.yaml b/.github/workflows/temp-branch-build-and-push.yaml index 00cee77d4..289fdc774 100644 --- a/.github/workflows/temp-branch-build-and-push.yaml +++ b/.github/workflows/temp-branch-build-and-push.yaml @@ -3,7 +3,7 @@ name: Branch - Build and push docker image on: push: branches: - - "feat/even-odd-import-from-s3" + - "chore/increase-stalled-stream-protection" concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' diff --git a/iris-mpc/src/bin/server.rs b/iris-mpc/src/bin/server.rs index 2ba9c657c..2ad947414 100644 --- a/iris-mpc/src/bin/server.rs +++ b/iris-mpc/src/bin/server.rs @@ -1,7 +1,10 @@ #![allow(clippy::needless_range_loop)] use aws_config::retry::RetryConfig; -use aws_sdk_s3::{config::Builder as S3ConfigBuilder, Client as S3Client}; +use aws_sdk_s3::{ + config::{Builder as S3ConfigBuilder, StalledStreamProtectionConfig}, + Client as S3Client, +}; use aws_sdk_sns::{types::MessageAttributeValue, Client as SNSClient}; use aws_sdk_sqs::{config::Region, Client}; use axum::{response::IntoResponse, routing::get, Router}; @@ -688,7 +691,10 @@ async fn server_main(config: Config) -> eyre::Result<()> { // Increase S3 retries to 5 let retry_config = RetryConfig::standard().with_max_attempts(5); + let s3_config = S3ConfigBuilder::from(&shared_config) + // disable stalled stream protection to avoid panics during s3 import + .stalled_stream_protection(StalledStreamProtectionConfig::disabled()) .retry_config(retry_config) .build(); let s3_client = Arc::new(S3Client::from_conf(s3_config));