Revert "Update CRT submodules to latest releases (#1430)" (#1435)

passaro · web-flow · commit 4e9fe1d0b9e5 · 2025-05-23T14:43:38.000Z
This reverts #1430 (commit ee6d44a). After merging the latest change to the CRT we have seen benchmark runs failing (e.g. https://github.com/awslabs/mountpoint-s3/actions/runs/15206336823/job/42770250949). We are reverting the change while we further investigate the issue. ### Does this change impact existing behavior? No. ### Does this change need a changelog entry? Does it require a version change? Reverts the previous changes. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and I agree to the terms of the [Developer Certificate of Origin (DCO)](https://developercertificate.org/). Signed-off-by: Alessandro Passaro <alexpax@amazon.co.uk>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mountpoint-s3-client/CHANGELOG.md b/mountpoint-s3-client/CHANGELOG.md
@@ -5,10 +5,6 @@
 * Variants of the `GetObjectError` and `S3RequestError` enums now contain a `ClientErrorMetadata` field,
   which stores information from the S3 response. ([#1411](https://github.com/awslabs/mountpoint-s3/pull/1411))
 
-### Other changes
-
-* Update to latest CRT dependencies.
-
 ## v0.14.1 (May 9, 2025)
 
 ### Other changes
diff --git a/mountpoint-s3-client/Cargo.toml b/mountpoint-s3-client/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/awslabs/mountpoint-s3"
 description = "High-performance Amazon S3 client for Mountpoint for Amazon S3."
 
 [dependencies]
-mountpoint-s3-crt = { path = "../mountpoint-s3-crt", version = "0.12.4" }
+mountpoint-s3-crt = { path = "../mountpoint-s3-crt", version = "0.12.3" }
 
 async-trait = "0.1.85"
 auto_impl = "1.2.1"
diff --git a/mountpoint-s3-crt-sys/CHANGELOG.md b/mountpoint-s3-crt-sys/CHANGELOG.md
@@ -1,7 +1,4 @@
-## Unreleased (v0.14.0)
-
-* Update to latest CRT dependencies.
-* Include bindings for the new `s3_buffer_pool` API in `aws-c-s3`. ([#1430](https://github.com/awslabs/mountpoint-s3/pull/1430))
+## Unreleased
 
 ## v0.13.1 (May 9, 2025)
 
diff --git a/mountpoint-s3-crt-sys/Cargo.toml b/mountpoint-s3-crt-sys/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mountpoint-s3-crt-sys"
 # See `/doc/PUBLISHING_CRATES.md` to read how to publish new versions.
-version = "0.14.0"
+version = "0.13.1"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/awslabs/mountpoint-s3"
diff --git a/mountpoint-s3-crt-sys/build.rs b/mountpoint-s3-crt-sys/build.rs
@@ -48,7 +48,6 @@ const CRT_HEADERS: &[&str] = &[
     "io/stream.h",
     "io/uri.h",
     "s3/s3.h",
-    "s3/s3_buffer_pool.h",
     "s3/s3_client.h",
     "s3/s3_endpoint_resolver.h",
     "sdkutils/endpoints_rule_engine.h",
@@ -60,7 +59,7 @@ const CRT_HEADERS: &[&str] = &[
 const PRIVATE_CRT_HEADERS: &[&str] = &[
     // To access S3 client stats
     "aws-c-s3/include/aws/s3/private/s3_client_impl.h",
-    "aws-c-s3/include/aws/s3/private/s3_default_buffer_pool.h",
+    "aws-c-s3/include/aws/s3/private/s3_buffer_pool.h",
 ];
 
 /// Get the OS name we are compiling to
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-cal b/mountpoint-s3-crt-sys/crt/aws-c-cal
@@ -1 +1 @@
-Subproject commit 938d0fea30d8476a7cf260278d636404682a28d4
+Subproject commit fa108de5280afd71018e0a0534edb36b33f030f6
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-common b/mountpoint-s3-crt-sys/crt/aws-c-common
@@ -1 +1 @@
-Subproject commit aaa2f11ed609e3f888efd9bf745e810b45b13a38
+Subproject commit 8ae8f48ebddb0ee2624d643952ac33afa5e8859e
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-http b/mountpoint-s3-crt-sys/crt/aws-c-http
@@ -1 +1 @@
-Subproject commit 3eedf1ef8c6874cd941dbde794a6ab3bd979e181
+Subproject commit ca7e0e291933ad9dac855e1477c558254363ff6a
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-io b/mountpoint-s3-crt-sys/crt/aws-c-io
@@ -1 +1 @@
-Subproject commit 689dee3cb8dbd8a6906431d154a3695f7688c056
+Subproject commit 8286c781b95b426ca2f0783b6c1fe49ff519c4e7
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-s3 b/mountpoint-s3-crt-sys/crt/aws-c-s3
@@ -1 +1 @@
-Subproject commit 52c90d39dab19a36e06d746a8c795060632619e2
+Subproject commit 7d2d4b3070109c882ff78e8719f60597c7ba0472
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-sdkutils b/mountpoint-s3-crt-sys/crt/aws-c-sdkutils
@@ -1 +1 @@
-Subproject commit f678bda9e21f7217e4bbf35e0d1ea59540687933
+Subproject commit ba6a28fab7ed5d7f1b3b1d12eb672088be093824
diff --git a/mountpoint-s3-crt/CHANGELOG.md b/mountpoint-s3-crt/CHANGELOG.md
@@ -1,6 +1,4 @@
-## Unreleased (v0.12.4)
-
-* Update to latest CRT dependencies.
+## Unreleased
 
 ## v0.12.3 (May 9, 2025)
 
diff --git a/mountpoint-s3-crt/Cargo.toml b/mountpoint-s3-crt/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "mountpoint-s3-crt"
 # See `/doc/PUBLISHING_CRATES.md` to read how to publish new versions.
-version = "0.12.4"
+version = "0.12.3"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/awslabs/mountpoint-s3"
 description = "Rust interface to the AWS Common Runtime for Mountpoint for Amazon S3."
 
 [dependencies]
-mountpoint-s3-crt-sys = { path = "../mountpoint-s3-crt-sys", version = "0.14.0" }
+mountpoint-s3-crt-sys = { path = "../mountpoint-s3-crt-sys", version = "0.13.1" }
 
 futures = "0.3.31"
 libc = "0.2.169"
diff --git a/mountpoint-s3-crt/src/s3/client.rs b/mountpoint-s3-crt/src/s3/client.rs
@@ -967,7 +967,7 @@ impl Client {
         // dereferencable as long as Client lives.
         let inner_stats = unsafe {
             let client = self.inner.as_ref();
-            aws_s3_default_buffer_pool_get_usage(client.buffer_pool)
+            aws_s3_buffer_pool_get_usage(client.buffer_pool)
         };
 
         let mem_limit = inner_stats.mem_limit as u64;
