hyper: refactor, update Rust, Hyper, and deps #9720

joshka · 2025-03-23T22:21:07Z

This is a fairly major refactoring of the hyper tests

Update Rust to 1.85.0
Update hyper to 1.6.0
Use socket2 instead of net2
Bump other dependencies
Remove hyper-db test. This is now provided as a route in the main test.
Add a new test using tokio multi-thread runtime to compare with the
single-thread runtime. This uses the same docker image, but passes a
command line argument to the server to use the multi-thread runtime.
Add a healthcheck /ping url to the dockerfile to ensure that the
server is running before running the tests.
Use deadpool-postgres for connection pooling.
Use cached prepared statements for the queries.
Factor each test into its own module.
Simplify the previous approach that used closures into more a more
straightforward approach that uses linear functions.
Add single query and multiple query tests.

- Update Rust to 1.85.0 - Update hyper to 1.6.0 - Use socket2 instead of net2 - Bump other dependencies - Remove hyper-db test. This is now provided as a route in the main test. - Add a new test using tokio multi-thread runtime to compare with the single-thread runtime. This uses the same docker image, but passes a command line argument to the server to use the multi-thread runtime. - Add a healthcheck /ping url to the dockerfile to ensure that the server is running before running the tests. - Use deadpool-postgres for connection pooling. - Use cached prepared statements for the queries. - Factor each test into its own module. - Simplify the previous approach that used closures into more a more straightforward approach that uses linear functions. - Add single query and multiple query tests.

joshka

Self review notes to assist reviewers

joshka · 2025-03-23T22:21:40Z

frameworks/Rust/hyper/.dockerignore

@@ -0,0 +1 @@
+target/


This makes it no longer necessary to run cargo clean in the dockerfile

joshka · 2025-03-23T22:22:00Z

frameworks/Rust/hyper/Cargo.toml

-[[bin]]
-name = "hyper-techempower"
-path = "src/main.rs"
-
-[[bin]]
-name = "hyper-db-techempower"
-path = "src/main_db.rs"
-


There's just one executable now

joshka · 2025-03-23T22:25:07Z

frameworks/Rust/hyper/Cargo.toml

 # Disable default runtime, so that tokio single thread can be used instead.
-hyper = { version = "0.14", features = ["server", "http1"], default-features = false }
+hyper = { version = "1.6.0", features = [


Dependencies use specific x.y.z versions instead of x.y versions. This is intentional as it means that the specific versions in use will be more obvious to the end user. Additionally the docker file now specifies --locked when building, which will keep the versions in use as they are specified.

Dependencies use specific x.y.z versions instead of x.y versions. This is intentional as it means that the specific versions in use will be more obvious to the end user.

This is equivalent to "^1.6.0" and not "=1.6.0", by the way.

That said, the lockfile should keep things pinned to what you have in this PR.

I'm geeking out that Steve Klabnik is here.

Dependencies use specific x.y.z versions instead of x.y versions. This is intentional as it means that the specific versions in use will be more obvious to the end user.

This is equivalent to "^1.6.0" and not "=1.6.0", by the way.

That said, the lockfile should keep things pinned to what you have in this PR.

Yup. I understand that. This is more from the perspective of users who tend to assume the latter. :)

joshka · 2025-03-23T22:26:20Z

frameworks/Rust/hyper/Cargo.toml

+serde_json = "1.0.140"
+socket2 = { version = "0.5.8", features = ["all"] }
+strum = { version = "0.27.1", features = ["derive"] }
+thiserror = "2.0.12"


Snafu might be more appropriate for the places where the errors crop up, but this will do for now.

joshka · 2025-03-23T22:27:28Z

frameworks/Rust/hyper/Cargo.toml

+tracing = "0.1.41"
+tracing-subscriber = "0.3.19"


Including this for some nicer logging of setup information during development. This is not intended to generally be called at runtime during benchmarks.

joshka · 2025-03-23T22:53:28Z

frameworks/Rust/hyper/src/main.rs

+    // spawn accept loop into a task so it is scheduled on the runtime with all the other tasks.
+    let accept_loop = accept_loop(handle.clone(), listener);
+    handle.spawn(accept_loop).await.unwrap()


TODO - check the perf impact of doing this vs not.

joshka · 2025-03-23T22:55:40Z

frameworks/Rust/hyper/src/main.rs

+    let service = service_fn(router);
+    loop {
+        let (stream, _) = listener.accept().await?;
+        let http = http.clone();


TODO It could be worth comparing this to just creating a new builder here. Unsure if there's any impact

joshka · 2025-03-23T22:57:54Z

frameworks/Rust/hyper/src/main.rs

+                // ignore errors until https://github.com/hyperium/hyper/pull/3863/ is merged
+                // This PR will allow us to filter out shutdown errors which are expected.
+                // warn!("Connection error (this may be normal during shutdown): {e}");


I think this occurs when the benchmarking tool just drops the connections.

joshka · 2025-03-23T23:02:00Z

frameworks/Rust/hyper/src/main.rs

+///
+/// This handler is used to verify that the server is running and can respond to requests. It is
+/// used by the docker health check command.
+fn ping() -> Result<Response<BoxBody<Bytes, Infallible>>> {


I had an incorrectly configured test and was struggling to get the benchmarks to properly connect to that one test. I wanted a way to ensure that the server was known to be up outside of the tests themselves, so added this to support the docker healthchecks.

(The underlying problem that I was hitting was caused by me returning an overly large static value for content length from the db test - 32 instead of actually calculating the length. This causes the test framework to not be able to connect to that test and also to not report which test is failing, only that it can't connect)

joshka · 2025-03-23T23:03:37Z

frameworks/Rust/hyper/src/multiple_queries.rs

+#[derive(Debug, Serialize)]
+pub struct World {
+    id: i32,
+    randomnumber: i32,
+}
+
+impl From<Row> for World {
+    fn from(row: Row) -> Self {
+        World {
+            id: row.get(0),
+            randomnumber: row.get(1),
+        }
+    }
+}


This is duplicated in the two db tests. I'm mostly fine with that here as it makes the tests more self-contained when reading them for understanding, and allows for future tweaks if the tests diverge.

joshka · 2025-03-23T23:13:51Z

Pinging @seanmonstar @steveklabnik @polachok for review as authors mentioned in the cargo.toml.

joshka · 2025-03-24T04:24:36Z

Removed precomputed headers due to #5201

joshka · 2025-03-24T21:04:55Z

I was a bit surprised to see this merged without a bit more review, but I guess we can see the results and work from there.
I fully anticipate that this might have some performance changes as my focus was more on making this more maintainable than it was on the pure speed aspect of things.

I suspect that the change from tokio-postgres to slapping a pool in front of it may cause a performance degredation based on #8790 (comment) (and other parts of the same issue).

All that said, it's possible that this PR provides a good enough base to add variations on top of like choice of ORM / pool etc.

joshka commented Mar 23, 2025

View reviewed changes

hyper: add maintainers

c692047

joshka added 3 commits March 23, 2025 21:21

fix: don't pre-compute json content-length

a363c3b

fix: add back socket.set_nodelay(true)

232989d

fix: don't precompute plaintext content-length header

1325b3a

msmith-techempower approved these changes Mar 24, 2025

View reviewed changes

msmith-techempower merged commit 2875eaf into TechEmpower:master Mar 24, 2025
3 checks passed

joshka deleted the jm/hyper-update branch March 24, 2025 22:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hyper: refactor, update Rust, Hyper, and deps #9720

hyper: refactor, update Rust, Hyper, and deps #9720

joshka commented Mar 23, 2025

joshka left a comment

joshka Mar 23, 2025 •

edited

Loading

joshka Mar 23, 2025

joshka Mar 23, 2025 •

edited

Loading

steveklabnik Mar 24, 2025

msmith-techempower Mar 24, 2025

joshka Mar 24, 2025

joshka Mar 23, 2025

joshka Mar 23, 2025

joshka Mar 23, 2025

joshka Mar 23, 2025

joshka Mar 23, 2025

joshka Mar 23, 2025

joshka Mar 23, 2025

joshka commented Mar 23, 2025

joshka commented Mar 24, 2025

joshka commented Mar 24, 2025

		@@ -0,0 +1 @@
		target/

		tracing = "0.1.41"
		tracing-subscriber = "0.3.19"

hyper: refactor, update Rust, Hyper, and deps #9720

hyper: refactor, update Rust, Hyper, and deps #9720

Conversation

joshka commented Mar 23, 2025

joshka left a comment

Choose a reason for hiding this comment

joshka Mar 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joshka Mar 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joshka commented Mar 23, 2025

joshka commented Mar 24, 2025

joshka commented Mar 24, 2025

joshka Mar 23, 2025 •

edited

Loading

joshka Mar 23, 2025 •

edited

Loading