Auto merge of #658 - Mark-Simulacrum:bump-deps, r=Mark-Simulacrum

bors · bors · commit b2c5d9a0c707 · 2022-07-30T19:13:52.000Z
Enable retries in the SDK It sounds like the previous definition for the SdkConfig would fail to configure a sleep impl, and currently that means that we're just silently not retrying any requests. This is obviously not what we want, and likely explains the repeated errors we saw on rust-lang/rust#99389 when generating the report.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,6 +65,7 @@ indexmap = "1.4.0"
 tokio = "1.18"
 aws-types = { version = "0.46", features = ["hardcoded-credentials"] }
 aws-smithy-http = "0.46"
+aws-smithy-async = "0.46"
 aws-sdk-s3 = "0.16"
 
 [dev-dependencies]
diff --git a/src/server/reports.rs b/src/server/reports.rs
@@ -28,6 +28,11 @@ fn generate_report(data: &Data, ex: &Experiment, results: &DatabaseDB) -> Fallib
         }
     }
     config.set_credentials_provider(Some(data.tokens.reports_bucket.to_aws_credentials()));
+    // https://github.com/awslabs/aws-sdk-rust/issues/586 -- without this, the
+    // SDK will just completely not retry requests.
+    config.set_sleep_impl(Some(Arc::new(
+        aws_smithy_async::rt::sleep::TokioSleep::new(),
+    )));
     let config = config.build();
     let client = aws_sdk_s3::Client::new(&config);
     let writer = report::S3Writer::create(

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,11 @@ fn generate_report(data: &Data, ex: &Experiment, results: &DatabaseDB) -> Fallib`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`config.set_credentials_provider(Some(data.tokens.reports_bucket.to_aws_credentials()));`
	`31`	`+ // https://github.com/awslabs/aws-sdk-rust/issues/586 -- without this, the`
	`32`	`+ // SDK will just completely not retry requests.`
	`33`	`+ config.set_sleep_impl(Some(Arc::new(`
	`34`	`+ aws_smithy_async::rt::sleep::TokioSleep::new(),`
	`35`	`+ )));`
`31`	`36`	`let config = config.build();`
`32`	`37`	`let client = aws_sdk_s3::Client::new(&config);`
`33`	`38`	`let writer = report::S3Writer::create(`