Skip to content

[release/0.12] Fix new CI issues #597

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

Merged
alamb merged 1 commit into from
Jan 8, 2026
Merged

[release/0.12] Fix new CI issues #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,18 @@ jobs:
# Necessary because tokio 1.30.0 updates MSRV to 1.63
# and url 2.5.1, updates to 1.67
run: |
cargo update -p parking_lot --precise 0.12.4
Copy link
Contributor Author

@AdamGS AdamGS Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of crates just recently made the jump from 1.64 to 1.68, parking_lot and tokio moved to 1.71 and even tracing made a very significant change to 1.65.

cargo update -p parking_lot_core --precise 0.9.11
cargo update -p lock_api --precise 0.4.13
cargo update -p quote --precise 1.0.41
cargo update -p proc-macro2 --precise 1.0.103
cargo update -p itoa --precise 1.0.15
cargo update -p syn --precise 2.0.106
cargo update -p tokio-util --precise 0.7.17
cargo update -p tokio --precise 1.29.1
cargo update -p url --precise 2.5.0
cargo update -p once_cell --precise 1.20.3
cargo update -p tracing --precise 0.1.41
cargo update -p tracing-core --precise 0.1.33
cargo update -p tracing-attributes --precise 0.1.28
- name: Check
Expand Down
2 changes: 2 additions & 0 deletions src/client/retry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,8 @@ mod tests {
// Reset the connection on the first n-1 attempts
for _ in 0..retry.max_retries {
let (stream, _) = listener.accept().await.unwrap();
// TcpStream::set_linger is deprecated but this use case is valid to reset the stream
#[allow(deprecated)]
stream.set_linger(Some(Duration::from_secs(0))).unwrap();
Comment on lines +847 to 849
Copy link
Contributor Author

@AdamGS AdamGS Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that this is more about it being a potential performance issue than anything else, with the thread being potentially blocked on drop.
This specific options will also be now available in new tokio versions as TcpStream::et_linger_zero.

Copy link
Contributor

@alamb alamb Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed -- @crepererum fixed the same issue in basically the same way on main in

}
// Succeed on the last attempt
Expand Down