Skip to content

Commit

Permalink
update Tower to 0.4.13 to fix load balancer panic
Browse files Browse the repository at this point in the history 
Tower [v0.4.13] includes a fix for a bug in the `tower::ready_cache`
module, tower-rs/tower#415. The `ready_cache` module is used internally
in Tower's load balancer. This bug resulted in panics in the proxy
(linkerd/linkerd2#8666, linkerd/linkerd2#6086) in cases where the
Destination service sends a very large number of service discovery
updates (see linkerd/linkerd2#8677).

This commit updates the proxy's dependency on `tower` to 0.4.13, to
ensure that this bugfix is picked up.

Fixes linkerd/linkerd2#8666
Fixes linkerd/linkerd2#6086

[v0.4.13]: https://github.com/tower-rs/tower/releases/tag/tower-0.4.13
  • Loading branch information
@hawkw
hawkw committed Jun 17, 2022
1 parent 2d8a10f commit c201375
Show file tree
Hide file tree
Showing 28 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Expand Up @@ -2481,9 +2481,9 @@ dependencies = [

[[package]]
name = "tower"
version = "0.4.12"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e"
checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
dependencies = [
"futures-core",
"futures-util",
Expand Down
2 changes: 1 addition & 1 deletion hyper-balance/Cargo.toml
View file
Expand Up @@ -11,7 +11,7 @@ futures = { version = "0.3", default-features = false }
http = "0.2"
hyper = "0.14"
pin-project = "1"
tower = { version = "0.4", default-features = false, features = ["load"] }
tower = { version = "0.4.13", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/Cargo.toml
View file
Expand Up @@ -29,5 +29,5 @@ thiserror = "1"
tokio = { version = "1", features = ["rt"] }
tokio-stream = { version = "0.1", features = ["time", "sync"] }
tonic = { version = "0.7", default-features = false, features = ["prost"] }
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
4 changes: 2 additions & 2 deletions linkerd/app/gateway/Cargo.toml
View file
Expand Up @@ -14,12 +14,12 @@ linkerd-app-inbound = { path = "../inbound" }
linkerd-app-outbound = { path = "../outbound" }
thiserror = "1"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tracing = "0.1"

[dev-dependencies]
tokio = { version = "1", features = ["rt", "macros"] }
tokio-test = "0.4"
tower = { version = "0.4", default-features = false, features = ["util"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }
tower-test = "0.4"
linkerd-app-test = { path = "../test" }
2 changes: 1 addition & 1 deletion linkerd/app/inbound/Cargo.toml
View file
Expand Up @@ -23,7 +23,7 @@ parking_lot = "0.12"
thiserror = "1"
tokio = { version = "1", features = ["sync"] }
tonic = { version = "0.7", default-features = false }
tower = { version = "0.4", features = ["util"] }
tower = { version = "0.4.13", features = ["util"] }
tracing = "0.1"

[target.'cfg(fuzzing)'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/Cargo.toml
View file
Expand Up @@ -46,7 +46,7 @@ tokio = { version = "1", features = ["io-util", "net", "rt", "macros"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tokio-rustls = "0.23"
rustls-pemfile = "1.0"
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tonic = { version = "0.7", default-features = false }
tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/Cargo.toml
View file
Expand Up @@ -26,7 +26,7 @@ linkerd-retry = { path = "../../retry" }
parking_lot = "0.12"
thiserror = "1"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4", features = ["util"] }
tower = { version = "0.4.13", features = ["util"] }
tracing = "0.1"
pin-project = "1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/test/Cargo.toml
View file
Expand Up @@ -23,7 +23,7 @@ regex = "1"
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
tokio-test = "0.4"
tokio-stream = { version = "0.1", features = ["sync"] }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tracing = "0.1"
thiserror = "1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/cache/Cargo.toml
View file
Expand Up @@ -15,7 +15,7 @@ linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
parking_lot = "0.12"
tokio = { version = "1", default-features = false, features = ["macros", "rt", "sync", "time"] }
tower = { version = "0.4", default-features = false, features = ["util"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }
tracing = "0.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/detect/Cargo.toml
View file
Expand Up @@ -14,5 +14,5 @@ linkerd-io = { path = "../io" }
linkerd-stack = { path = "../stack" }
tokio = { version = "1", features = ["time"] }
thiserror = "1"
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/http-classify/Cargo.toml
View file
Expand Up @@ -10,4 +10,4 @@ publish = false
http = "0.2"
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
2 changes: 1 addition & 1 deletion linkerd/http-metrics/Cargo.toml
View file
Expand Up @@ -19,5 +19,5 @@ linkerd-stack = { path = "../stack" }
parking_lot = "0.12"
pin-project = "1"
tokio = { version = "1", features = ["time"] }
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/proxy/api-resolve/Cargo.toml
View file
Expand Up @@ -23,5 +23,5 @@ http-body = "0.4"
pin-project = "1"
prost = "0.10"
tonic = { version = "0.7", default-features = false }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/proxy/core/Cargo.toml
View file
Expand Up @@ -12,4 +12,4 @@ Core interfaces needed to implement proxy components
[dependencies]
futures = { version = "0.3", default-features = false }
linkerd-error = { path = "../../error" }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
4 changes: 2 additions & 2 deletions linkerd/proxy/discover/Cargo.toml
View file
Expand Up @@ -17,11 +17,11 @@ linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["rt", "sync", "time"] }
tokio-util = "0.7"
tower = { version = "0.4", features = ["discover"] }
tower = { version = "0.4.13", features = ["discover"] }
tracing = "0.1"
pin-project = "1"

[dev-dependencies]
async-stream = "0.3"
tokio = { version = "1", features = ["macros"] }
tower = { version = "0.4", default-features = false, features = ["discover", "util"] }
tower = { version = "0.4.13", default-features = false, features = ["discover", "util"] }
2 changes: 1 addition & 1 deletion linkerd/proxy/dns-resolve/Cargo.toml
View file
Expand Up @@ -18,5 +18,5 @@ linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["sync"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/proxy/http/Cargo.toml
View file
Expand Up @@ -31,7 +31,7 @@ linkerd-stack = { path = "../../stack" }
rand = "0.8"
thiserror = "1"
tokio = { version = "1", features = ["time", "rt"] }
tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
tower = { version = "0.4.13", default-features = false, features = ["balance", "load", "discover"] }
tracing = "0.1"
try-lock = "0.2"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/resolve/Cargo.toml
View file
Expand Up @@ -14,6 +14,6 @@ futures = { version = "0.3", default-features = false }
linkerd-error = { path = "../../error" }
linkerd-proxy-core = { path = "../core" }
thiserror = "1"
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/proxy/tap/Cargo.toml
View file
Expand Up @@ -23,7 +23,7 @@ parking_lot = "0.12"
rand = { version = "0.8" }
thiserror = "1"
tokio = { version = "1", features = ["time"] }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tonic = { version = "0.7", default-features = false }
tracing = "0.1"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tcp/Cargo.toml
View file
Expand Up @@ -14,5 +14,5 @@ linkerd-error = { path = "../../error" }
linkerd-stack = { path = "../../stack" }
rand = "0.8"
tokio = { version = "1" }
tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
tower = { version = "0.4.13", default-features = false, features = ["balance", "load", "discover"] }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/reconnect/Cargo.toml
View file
Expand Up @@ -10,7 +10,7 @@ publish = false
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
futures = { version = "0.3", default-features = false }
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tracing = "0.1"
pin-project = "1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/retry/Cargo.toml
View file
Expand Up @@ -10,5 +10,5 @@ publish = false
futures = { version = "0.3", default-features = false }
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
tower = { version = "0.4", default-features = false, features = ["retry"] }
tower = { version = "0.4.13", default-features = false, features = ["retry"] }
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/service-profiles/Cargo.toml
View file
Expand Up @@ -28,7 +28,7 @@ regex = "1"
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tonic = { version = "0.7", default-features = false }
tower = { version = "0.4", features = ["ready-cache", "retry", "util"] }
tower = { version = "0.4.13", features = ["ready-cache", "retry", "util"] }
thiserror = "1"
tracing = "0.1"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/stack/Cargo.toml
View file
Expand Up @@ -16,7 +16,7 @@ parking_lot = "0.12"
pin-project = "1"
thiserror = "1"
tokio = { version = "1", features = ["time"] }
tower = { version = "0.4", features = ["filter", "util"] }
tower = { version = "0.4.13", features = ["filter", "util"] }
tracing = "0.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/stack/metrics/Cargo.toml
View file
Expand Up @@ -9,5 +9,5 @@ publish = false
[dependencies]
linkerd-metrics = { path = "../../metrics" }
parking_lot = "0.12"
tower = { version = "0.4", default-features = false }
tower = { version = "0.4.13", default-features = false }
tokio = { version = "1", features = ["time"] }
2 changes: 1 addition & 1 deletion linkerd/stack/tracing/Cargo.toml
View file
Expand Up @@ -10,5 +10,5 @@ publish = false
futures = { version = "0.3", default-features = false }
linkerd-error = { path = "../../error" }
linkerd-stack = { path = ".." }
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/tls/Cargo.toml
View file
Expand Up @@ -19,7 +19,7 @@ linkerd-stack = { path = "../stack" }
pin-project = "1"
thiserror = "1"
tokio = { version = "1", features = ["macros", "time"] }
tower = "0.4"
tower = "0.4.13"
tracing = "0.1"
untrusted = "0.7"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/trace-context/Cargo.toml
View file
Expand Up @@ -16,5 +16,5 @@ linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
rand = "0.8"
thiserror = "1"
tower = { version = "0.4", default-features = false, features = ["util"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }
tracing = "0.1"

0 comments on commit c201375

Please sign in to comment.