Skip to content

Commit

Permalink
deps: update futures to 0.3.15
Browse files Browse the repository at this point in the history 
This branch updates the `futures` crate to v0.3.15. This includes a fix
for task starvation with `FuturesUnordered` (added in 0.3.13). This may
or may not be related to issues that have been reported in the proxy
involving the load balancer (linkerd/linkerd2#6086), but we should
update to the fixed version regardless. This may also improve
performance in some cases, since we may now have to do fewer poll-wakeup
cycles when a load balancer has a large number of pending endpoints.
  • Loading branch information
@hawkw
hawkw committed Jun 1, 2021
1 parent cd6da0f commit afd36a8
Show file tree
Hide file tree
Showing 42 changed files with 118 additions and 113 deletions.
41 changes: 20 additions & 21 deletions Cargo.lock
View file
Expand Up @@ -231,9 +231,9 @@ dependencies = [

[[package]]
name = "futures"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
dependencies = [
"futures-channel",
"futures-core",
Expand All @@ -246,25 +246,25 @@ dependencies = [

[[package]]
name = "futures-channel"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
dependencies = [
"futures-core",
"futures-sink",
]

[[package]]
name = "futures-core"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"

[[package]]
name = "futures-executor"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
dependencies = [
"futures-core",
"futures-task",
Expand All @@ -273,16 +273,17 @@ dependencies = [

[[package]]
name = "futures-io"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"

[[package]]
name = "futures-macro"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
dependencies = [
"autocfg",
"proc-macro-hack",
"proc-macro2",
"quote",
Expand All @@ -291,25 +292,23 @@ dependencies = [

[[package]]
name = "futures-sink"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"

[[package]]
name = "futures-task"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
dependencies = [
"once_cell",
]
checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"

[[package]]
name = "futures-util"
version = "0.3.12"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
dependencies = [
"autocfg",
"futures-channel",
"futures-core",
"futures-io",
Expand Down
2 changes: 1 addition & 1 deletion hyper-balance/Cargo.toml
View file
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
publish = false

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
http = "0.2"
hyper = "0.14.2"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/Cargo.toml
View file
Expand Up @@ -15,7 +15,7 @@ This is used by tests and the executable.
allow-loopback = ["linkerd-app-outbound/allow-loopback"]

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
indexmap = "1.0"
ipnet = "2.0"
linkerd-app-core = { path = "./core" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/core/Cargo.toml
View file
Expand Up @@ -17,7 +17,7 @@ bytes = "1"
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14.2", features = ["http1", "http2"] }
futures = "0.3.9"
futures = "0.3.15"
indexmap = "1.0"
ipnet = "2.0"
linkerd-addr = { path = "../../addr" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/gateway/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
http = "0.2"
futures = "0.3.9"
futures = "0.3.15"
indexmap = "1.0"
linkerd-app-core = { path = "../core" }
linkerd-app-inbound = { path = "../inbound" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/Cargo.toml
View file
Expand Up @@ -12,7 +12,7 @@ Configures and runs the inbound proxy
[dependencies]
bytes = "1"
http = "0.2"
futures = "0.3.9"
futures = "0.3.15"
indexmap = "1.0"
linkerd-app-core = { path = "../core" }
thiserror = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/Cargo.toml
View file
Expand Up @@ -18,7 +18,7 @@ flaky_tests = []

[dependencies]
bytes = "1"
futures = "0.3.9"
futures = "0.3.15"
h2 = "0.3"
http = "0.2"
http-body = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/Cargo.toml
View file
Expand Up @@ -17,7 +17,7 @@ test-subscriber = []
[dependencies]
bytes = "1"
http = "0.2"
futures = "0.3.9"
futures = "0.3.15"
indexmap = "1.0"
linkerd-app-core = { path = "../core" }
linkerd-http-retry = { path = "../../http-retry" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/test/Cargo.toml
View file
Expand Up @@ -17,7 +17,7 @@ a dedicated crate to help the compiler cache dependencies properly.
flaky_tests = []

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
h2 = "0.3"
http = "0.2"
http-body = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/cache/Cargo.toml
View file
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
publish = false

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
parking_lot = "0.11"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/concurrency-limit/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false


[dependencies]
futures = "0.3.9"
futures = "0.3.15"
linkerd-stack = { path = "../stack" }
tokio = { version = "1", features = ["sync"] }
tokio-util = "0.6.5"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/dns/Cargo.toml
View file
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
publish = false

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
linkerd-dns-name = { path = "./name" }
linkerd-error = { path = "../error" }
thiserror = "1.0"
Expand Down
38 changes: 20 additions & 18 deletions linkerd/dns/fuzz/Cargo.lock
View file
Expand Up @@ -106,9 +106,9 @@ dependencies = [

[[package]]
name = "futures"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
dependencies = [
"futures-channel",
"futures-core",
Expand All @@ -121,25 +121,25 @@ dependencies = [

[[package]]
name = "futures-channel"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
dependencies = [
"futures-core",
"futures-sink",
]

[[package]]
name = "futures-core"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"

[[package]]
name = "futures-executor"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
dependencies = [
"futures-core",
"futures-task",
Expand All @@ -148,16 +148,17 @@ dependencies = [

[[package]]
name = "futures-io"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"

[[package]]
name = "futures-macro"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
dependencies = [
"autocfg",
"proc-macro-hack",
"proc-macro2",
"quote",
Expand All @@ -166,22 +167,23 @@ dependencies = [

[[package]]
name = "futures-sink"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"

[[package]]
name = "futures-task"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"

[[package]]
name = "futures-util"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
dependencies = [
"autocfg",
"futures-channel",
"futures-core",
"futures-io",
Expand Down
2 changes: 1 addition & 1 deletion linkerd/drain/Cargo.toml
View file
Expand Up @@ -10,7 +10,7 @@ publish = false
retain = ["linkerd-stack", "tower"]

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
tokio = { version = "1", features = ["macros", "sync"] }

linkerd-stack = { path = "../stack", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/duplex/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
bytes = "1"
futures = "0.3.9"
futures = "0.3.15"
tokio = { version = "1", features = ["io-util"] }
pin-project = "1"
tracing = "0.1.23"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/error-metrics/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false


[dependencies]
futures = "0.3.9"
futures = "0.3.15"
indexmap = "1.0"
linkerd-metrics = { path = "../metrics" }
tower = { version = "0.4.7", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/error-respond/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false


[dependencies]
futures = "0.3.9"
futures = "0.3.15"
linkerd-error = { path = "../error" }
tower = { version = "0.4.7", default-features = false }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/error/Cargo.toml
View file
Expand Up @@ -7,4 +7,4 @@ edition = "2018"
publish = false

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
2 changes: 1 addition & 1 deletion linkerd/exp-backoff/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false


[dependencies]
futures = "0.3.9"
futures = "0.3.15"
rand = { version = "0.8", features = ["small_rng"] }
thiserror = "1.0"
tokio = { version = "1", features = ["time"]}
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http-box/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
bytes = "1"
futures = "0.3.9"
futures = "0.3.15"
http = "0.2"
http-body = "0.4"
linkerd-error = { path = "../error" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http-metrics/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
bytes = "1"
futures = "0.3.9"
futures = "0.3.15"
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14.2", features = ["http1", "http2"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/io/Cargo.toml
View file
Expand Up @@ -14,7 +14,7 @@ default = []

[dependencies]
async-trait = "0.1"
futures = "0.3.9"
futures = "0.3.15"
bytes = "1"
linkerd-errno = { path = "../errno" }
tokio = { version = "1", features = ["io-util", "net"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/api-resolve/Cargo.toml
View file
Expand Up @@ -11,7 +11,7 @@ Implements the Resolve trait using the proxy's gRPC API

[dependencies]
async-stream = "0.3"
futures = "0.3.9"
futures = "0.3.15"
linkerd-addr = { path = "../../addr" }
linkerd-error = { path = "../../error" }
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.18" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/core/Cargo.toml
View file
Expand Up @@ -10,7 +10,7 @@ Core interfaces needed to implement proxy components
"""

[dependencies]
futures = "0.3.9"
futures = "0.3.15"
linkerd-error = { path = "../../error" }
tower = { version = "0.4.7", default-features = false }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/proxy/discover/Cargo.toml
View file
Expand Up @@ -11,7 +11,7 @@ Utilities to implement a Discover with the core Resolve type


[dependencies]
futures = "0.3.9"
futures = "0.3.15"
linkerd-error = { path = "../../error" }
linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
Expand Down

0 comments on commit afd36a8

Please sign in to comment.