Skip to content

Commit

Permalink
back out "Update Rust crate tokio to 1.39.2 (#6249)" (#6356)
Browse files Browse the repository at this point in the history 
Tokio 1.39 updated its mio dependency to 1.0, which changed the waker impl on illumos from a self-pipe to eventfd. That has caused several issues already:

* oxidecomputer/helios#169
* oxidecomputer/helios#171

Based on these and the potential for other lurking issues, we're making a policy decision to roll back to 1.38 (mio 0.8) for r10. We can't be off of the train forever so we're aiming to land the 1.39 update early in the r11 cycle.

This backs out commit d7d4bea.
  • Loading branch information
@sunshowers
sunshowers authored Aug 20, 2024
1 parent 256c066 commit 2e0025c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
15 changes: 8 additions & 7 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ textwrap = "0.16.1"
test-strategy = "0.3.1"
thiserror = "1.0"
tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
tokio = "1.39.2"
tokio = "1.38.1"
tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
tokio-stream = "0.1.15"
tokio-tungstenite = "0.20"
Expand Down
20 changes: 10 additions & 10 deletions workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ string_cache = { version = "0.8.7" }
subtle = { version = "2.5.0" }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
tokio = { version = "1.39.2", features = ["full", "test-util"] }
tokio = { version = "1.38.1", features = ["full", "test-util"] }
tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
tokio-stream = { version = "0.1.15", features = ["net"] }
tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
Expand Down Expand Up @@ -217,7 +217,7 @@ syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extr
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
tokio = { version = "1.39.2", features = ["full", "test-util"] }
tokio = { version = "1.38.1", features = ["full", "test-util"] }
tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
tokio-stream = { version = "0.1.15", features = ["net"] }
tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
Expand All @@ -237,7 +237,7 @@ zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
[target.x86_64-unknown-linux-gnu.dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -246,43 +246,43 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
[target.x86_64-unknown-linux-gnu.build-dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.x86_64-apple-darwin.dependencies]
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.x86_64-apple-darwin.build-dependencies]
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.aarch64-apple-darwin.dependencies]
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.aarch64-apple-darwin.build-dependencies]
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }

[target.x86_64-unknown-illumos.dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -291,7 +291,7 @@ toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", featu

[target.x86_64-unknown-illumos.build-dependencies]
dof = { version = "0.3.0", default-features = false, features = ["des"] }
mio = { version = "1.0.2", features = ["net", "os-ext"] }
mio = { version = "0.8.11", features = ["net", "os-ext"] }
nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
once_cell = { version = "1.19.0" }
rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
Expand Down

0 comments on commit 2e0025c

Please sign in to comment.