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.

Sign up for GitHub

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

Update CRT submodules to latest releases #633

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Update CRT submodules to latest releases #633

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e11ad8
Update CRT submodules to latest releases
dannycjones Nov 27, 2023
838cdfa
Add changelog entries
dannycjones Nov 27, 2023
d90f2bd
Update aws_s3_request_type bindings
dannycjones Nov 27, 2023
c2f927a
Update based on feedback
dannycjones Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mountpoint-s3-client/src/s3_crt_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions mountpoint-s3-crt-sys/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 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))
dannycjones marked this conversation as resolved.
Show resolved Hide resolved

## v0.4.0 (November 21, 2023)

* Update to latest CRT dependencies
Expand Down
2 changes: 1 addition & 1 deletion mountpoint-s3-crt-sys/crt/aws-c-auth
Open in desktop
Submodule aws-c-auth updated 6 files
+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
2 changes: 1 addition & 1 deletion mountpoint-s3-crt-sys/crt/aws-c-common
Open in desktop
Submodule aws-c-common updated 1 files
+42 −6 source/posix/cross_process_lock.c
2 changes: 1 addition & 1 deletion mountpoint-s3-crt-sys/crt/aws-c-io
Open in desktop
Submodule aws-c-io updated 3 files
+1 −1 include/aws/io/retry_strategy.h
+1 −1 source/exponential_backoff_retry_strategy.c
+2 −4 source/pkcs11_tls_op_handler.c
2 changes: 1 addition & 1 deletion mountpoint-s3-crt-sys/crt/aws-c-s3
Open in desktop
Submodule aws-c-s3 updated 29 files
+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
2 changes: 1 addition & 1 deletion mountpoint-s3-crt-sys/crt/aws-lc
Open in desktop
Submodule aws-lc updated from a8d06d to 80f3f3
6 changes: 6 additions & 0 deletions mountpoint-s3-crt/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`

## v0.4.0 (November 21, 2023)

* Update to latest CRT dependencies
Expand Down
39 changes: 27 additions & 12 deletions mountpoint-s3-crt/src/s3/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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),
}
}
Expand Down Expand Up @@ -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));
}
}
Loading