From b4a50fd99f8d56598ceeb60c2307fea068ab4778 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 4 Dec 2020 13:52:37 +1000 Subject: [PATCH] Downgrade tokio to 0.3.4 to avoid a time wheel panic (#1453) See tokio-rs/tokio#2789 for details. We were seeing this panic during normal operation, not just at shutdown. --- zebra-consensus/Cargo.toml | 4 ++-- zebra-network/Cargo.toml | 2 +- zebra-state/Cargo.toml | 4 ++-- zebra-test/Cargo.toml | 2 +- zebrad/Cargo.toml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index a696b636..911c5fca 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -19,7 +19,7 @@ futures = "0.3.7" futures-util = "0.3.6" metrics = "0.12" thiserror = "1.0.22" -tokio = { version = "0.3", features = ["time", "sync", "stream", "tracing"] } +tokio = { version = "0.3.4", features = ["time", "sync", "stream", "tracing"] } tower = { version = "0.4", features = ["timeout", "util", "buffer"] } tower-util = "0.3" tracing = "0.1.22" @@ -34,7 +34,7 @@ zebra-script = { path = "../zebra-script" } [dev-dependencies] rand = "0.7" spandoc = "0.2" -tokio = { version = "0.3", features = ["full"] } +tokio = { version = "0.3.4", features = ["full"] } tracing-error = "0.1.2" tracing-subscriber = "0.2.15" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 23fd4380..ec1cdccf 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1", features = ["serde_derive"] } thiserror = "1" futures = "0.3" -tokio = { version = "0.3", features = ["net", "time", "stream", "tracing", "macros", "rt-multi-thread"] } +tokio = { version = "0.3.4", features = ["net", "time", "stream", "tracing", "macros", "rt-multi-thread"] } tokio-util = { version = "0.5", features = ["codec"] } tower = { version = "0.4", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index c634c0f0..53b90035 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -22,7 +22,7 @@ tower = { version = "0.4", features = ["buffer", "util"] } tracing = "0.1" tracing-error = "0.1.2" thiserror = "1.0.22" -tokio = { version = "0.3", features = ["sync"] } +tokio = { version = "0.3.4", features = ["sync"] } displaydoc = "0.1.7" rocksdb = "0.15.0" tempdir = "0.3.7" @@ -37,7 +37,7 @@ zebra-test = { path = "../zebra-test/" } once_cell = "1.5" spandoc = "0.2" tempdir = "0.3.7" -tokio = { version = "0.3", features = ["full"] } +tokio = { version = "0.3.4", features = ["full"] } proptest = "0.10.1" proptest-derive = "0.2" primitive-types = "0.7.3" diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 0aaded06..101f3d5d 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -25,4 +25,4 @@ proptest = "0.10.1" tempdir = "0.3.7" [dev-dependencies] -tokio = { version = "0.3", features = ["full"] } +tokio = { version = "0.3.4", features = ["full"] } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index d02fc540..aa3c1cd5 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -21,7 +21,7 @@ rand = "0.7" hyper = { version = "0.14.0-dev", features = ["full"] } futures = "0.3" -tokio = { version = "0.3", features = ["time", "rt-multi-thread", "stream", "macros", "tracing", "signal"] } +tokio = { version = "0.3.4", features = ["time", "rt-multi-thread", "stream", "macros", "tracing", "signal"] } tower = { version = "0.4", features = ["hedge", "limit"] } pin-project = "0.4.23"