Update CRT submodules to latest releases (awslabs#633)

* Update CRT submodules to latest releases Signed-off-by: Daniel Carl Jones <[email protected]> * Add changelog entries Signed-off-by: Daniel Carl Jones <[email protected]> * Update aws_s3_request_type bindings Signed-off-by: Daniel Carl Jones <[email protected]> * Update based on feedback Signed-off-by: Daniel Carl Jones <[email protected]> --------- Signed-off-by: Daniel Carl Jones <[email protected]>
monthonk · Nov 28, 2023 · c3521f3 · c3521f3
1 parent f2860e7
commit c3521f3
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 18 deletions.
diff --git a/mountpoint-s3-client/src/s3_crt_client.rs b/mountpoint-s3-client/src/s3_crt_client.rs
@@ -828,9 +828,12 @@ fn status_code_to_log_level(status_code: i32) -> tracing::Level {
 }
 
 /// Return a string version of a [RequestType] for use in metrics
+///
+/// TODO: Replace this method with `aws_s3_request_metrics_get_operation_name`,
+///       and ensure all requests have an associated operation name.
 fn request_type_to_metrics_string(request_type: RequestType) -> &'static str {
     match request_type {
-        RequestType::Default => "Default",
+        RequestType::Unknown => "Default",
         RequestType::HeadObject => "HeadObject",
         RequestType::GetObject => "GetObject",
         RequestType::ListParts => "ListParts",

diff --git a/mountpoint-s3-crt-sys/CHANGELOG.md b/mountpoint-s3-crt-sys/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased
+
+* Update to latest CRT dependencies
+
 ## v0.4.0 (November 21, 2023)
 
 * Update to latest CRT dependencies

diff --git a/mountpoint-s3-crt-sys/crt/aws-c-auth b/mountpoint-s3-crt-sys/crt/aws-c-auth
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-common b/mountpoint-s3-crt-sys/crt/aws-c-common
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-io b/mountpoint-s3-crt-sys/crt/aws-c-io
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-s3 b/mountpoint-s3-crt-sys/crt/aws-c-s3
diff --git a/mountpoint-s3-crt-sys/crt/aws-lc b/mountpoint-s3-crt-sys/crt/aws-lc
diff --git a/mountpoint-s3-crt/CHANGELOG.md b/mountpoint-s3-crt/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Unreleased
+
+* Update to latest CRT dependencies
+* Default exponential backoff value retries is now 500ms rather than 25ms ([awslabs/aws-c-io#612](https://github.com/awslabs/aws-c-io/pull/612))
+* Renamed `s3::RequestType::Default` to `s3::RequestType::Unknown` to match CRT change ([#633](https://github.com/awslabs/mountpoint-s3/pull/633))
+
 ## v0.4.0 (November 21, 2023)
 
 * Update to latest CRT dependencies

diff --git a/mountpoint-s3-crt/src/s3/client.rs b/mountpoint-s3-crt/src/s3/client.rs
@@ -1007,8 +1007,8 @@ impl Debug for RequestMetrics {
 /// multiple requests to various S3 APIs; this type can be used to distinguish them.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum RequestType {
-    /// Same as the original HTTP request passed to [Client::make_meta_request]
-    Default,
+    /// When the request type is unknown to the CRT. Operation name may have been attached to non-meta CRT requests.
+    Unknown,
     /// HeadObject: https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html
     HeadObject,
     /// GetObject: https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
@@ -1029,17 +1029,16 @@ pub enum RequestType {
 
 impl From<aws_s3_request_type> for RequestType {
     fn from(value: aws_s3_request_type) -> Self {
-        use aws_s3_request_type::*;
         match value {
-            AWS_S3_REQUEST_TYPE_DEFAULT => RequestType::Default,
-            AWS_S3_REQUEST_TYPE_HEAD_OBJECT => RequestType::HeadObject,
-            AWS_S3_REQUEST_TYPE_GET_OBJECT => RequestType::GetObject,
-            AWS_S3_REQUEST_TYPE_LIST_PARTS => RequestType::ListParts,
-            AWS_S3_REQUEST_TYPE_CREATE_MULTIPART_UPLOAD => RequestType::CreateMultipartUpload,
-            AWS_S3_REQUEST_TYPE_UPLOAD_PART => RequestType::UploadPart,
-            AWS_S3_REQUEST_TYPE_ABORT_MULTIPART_UPLOAD => RequestType::AbortMultipartUpload,
-            AWS_S3_REQUEST_TYPE_COMPLETE_MULTIPART_UPLOAD => RequestType::CompleteMultipartUpload,
-            AWS_S3_REQUEST_TYPE_UPLOAD_PART_COPY => RequestType::UploadPartCopy,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_UNKNOWN => RequestType::Unknown,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_HEAD_OBJECT => RequestType::HeadObject,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_GET_OBJECT => RequestType::GetObject,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_LIST_PARTS => RequestType::ListParts,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_CREATE_MULTIPART_UPLOAD => RequestType::CreateMultipartUpload,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_UPLOAD_PART => RequestType::UploadPart,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_ABORT_MULTIPART_UPLOAD => RequestType::AbortMultipartUpload,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_COMPLETE_MULTIPART_UPLOAD => RequestType::CompleteMultipartUpload,
+            aws_s3_request_type::AWS_S3_REQUEST_TYPE_UPLOAD_PART_COPY => RequestType::UploadPartCopy,
             _ => panic!("unknown request type {:?}", value),
         }
     }
@@ -1171,3 +1170,19 @@ impl UploadReviewPart {
         Self { size, checksum }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use test_case::test_case;
+
+    use crate::aws_s3_request_type;
+    use crate::s3::client::RequestType;
+
+    #[test_case(aws_s3_request_type::AWS_S3_REQUEST_TYPE_UNKNOWN, RequestType::Unknown)]
+    #[test_case(aws_s3_request_type::AWS_S3_REQUEST_TYPE_HEAD_OBJECT, RequestType::HeadObject)]
+    #[test_case(aws_s3_request_type::AWS_S3_REQUEST_TYPE_GET_OBJECT, RequestType::GetObject)]
+    fn request_type_from_aws_s3_request_type(c_request_type: aws_s3_request_type, expected_request_type: RequestType) {
+        // Simple, but was previously broken.
+        assert_eq!(expected_request_type, RequestType::from(c_request_type));
+    }
+}
+5 −0		include/aws/auth/aws_imds_client.h
+5 −0		include/aws/auth/credentials.h
+34 −18		source/aws_imds_client.c
+1 −0		source/credentials_provider_imds.c
+1 −0		tests/CMakeLists.txt
+61 −9		tests/aws_imds_client_test.c
+1 −1		include/aws/io/retry_strategy.h
+1 −1		source/exponential_backoff_retry_strategy.c
+2 −4		source/pkcs11_tls_op_handler.c
+3 −0		.github/workflows/stale_issue.yml
+76 −0		docs/memory_aware_request_execution.md
+133 −0		include/aws/s3/private/s3_buffer_pool.h
+8 −0		include/aws/s3/private/s3_client_impl.h
+7 −0		include/aws/s3/private/s3_default_meta_request.h
+0 −3		include/aws/s3/private/s3_meta_request_impl.h
+23 −3		include/aws/s3/private/s3_request.h
+1 −0		include/aws/s3/s3.h
+68 −6		include/aws/s3/s3_client.h
+1 −0		source/s3.c
+30 −22		source/s3_auto_ranged_get.c
+50 −46		source/s3_auto_ranged_put.c
+418 −0		source/s3_buffer_pool.c
+3 −3		source/s3_chunk_stream.c
+139 −11		source/s3_client.c
+12 −30		source/s3_copy_object.c
+34 −2		source/s3_default_meta_request.c
+2,788 −2,788		source/s3_endpoint_resolver/aws_s3_endpoint_rule_set.c
+35 −24		source/s3_meta_request.c
+8 −4		source/s3_platform_info.c
+36 −10		source/s3_request.c
+27 −0		source/s3_util.c
+8 −0		tests/CMakeLists.txt
+188 −0		tests/s3_buffer_pool_tests.c
+154 −30		tests/s3_data_plane_tests.c
+13 −0		tests/s3_mock_server_tests.c
+11 −0		tests/s3_tester.c
+2 −0		tests/s3_tester.h
+24 −0		tests/s3_util_tests.c