Skip to content

Commit a9f4012

Browse files
hawkwhawkw
authored
deps: update futures to 0.3.15 (#1022)
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.
1 parent dfed4bf commit a9f4012

File tree

44 files changed

+158
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+158
-149
lines changed

‎Cargo.lock

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ dependencies = [
231231

232232
[[package]]
233233
name = "futures"
234-
version = "0.3.12"
234+
version = "0.3.15"
235235
source = "registry+https://github.com/rust-lang/crates.io-index"
236-
checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
236+
checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
237237
dependencies = [
238238
"futures-channel",
239239
"futures-core",
@@ -246,25 +246,25 @@ dependencies = [
246246

247247
[[package]]
248248
name = "futures-channel"
249-
version = "0.3.12"
249+
version = "0.3.15"
250250
source = "registry+https://github.com/rust-lang/crates.io-index"
251-
checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
251+
checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
252252
dependencies = [
253253
"futures-core",
254254
"futures-sink",
255255
]
256256

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

263263
[[package]]
264264
name = "futures-executor"
265-
version = "0.3.12"
265+
version = "0.3.15"
266266
source = "registry+https://github.com/rust-lang/crates.io-index"
267-
checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
267+
checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
268268
dependencies = [
269269
"futures-core",
270270
"futures-task",
@@ -273,16 +273,17 @@ dependencies = [
273273

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

280280
[[package]]
281281
name = "futures-macro"
282-
version = "0.3.12"
282+
version = "0.3.15"
283283
source = "registry+https://github.com/rust-lang/crates.io-index"
284-
checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
284+
checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
285285
dependencies = [
286+
"autocfg",
286287
"proc-macro-hack",
287288
"proc-macro2",
288289
"quote",
@@ -291,25 +292,23 @@ dependencies = [
291292

292293
[[package]]
293294
name = "futures-sink"
294-
version = "0.3.12"
295+
version = "0.3.15"
295296
source = "registry+https://github.com/rust-lang/crates.io-index"
296-
checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
297+
checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
297298

298299
[[package]]
299300
name = "futures-task"
300-
version = "0.3.12"
301+
version = "0.3.15"
301302
source = "registry+https://github.com/rust-lang/crates.io-index"
302-
checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
303-
dependencies = [
304-
"once_cell",
305-
]
303+
checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
306304

307305
[[package]]
308306
name = "futures-util"
309-
version = "0.3.12"
307+
version = "0.3.15"
310308
source = "registry+https://github.com/rust-lang/crates.io-index"
311-
checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
309+
checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
312310
dependencies = [
311+
"autocfg",
313312
"futures-channel",
314313
"futures-core",
315314
"futures-io",

‎hyper-balance/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2018"
77
publish = false
88

99
[dependencies]
10-
futures = "0.3.9"
10+
futures = "0.3.15"
1111
http = "0.2"
1212
hyper = "0.14.2"
1313
pin-project = "1"

‎linkerd/app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This is used by tests and the executable.
1515
allow-loopback = ["linkerd-app-outbound/allow-loopback"]
1616

1717
[dependencies]
18-
futures = "0.3.9"
18+
futures = "0.3.15"
1919
indexmap = "1.0"
2020
ipnet = "2.0"
2121
linkerd-app-core = { path = "./core" }

‎linkerd/app/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bytes = "1"
1717
http = "0.2"
1818
http-body = "0.4"
1919
hyper = { version = "0.14.2", features = ["http1", "http2"] }
20-
futures = "0.3.9"
20+
futures = "0.3.15"
2121
indexmap = "1.0"
2222
ipnet = "2.0"
2323
linkerd-addr = { path = "../../addr" }

‎linkerd/app/gateway/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88

99
[dependencies]
1010
http = "0.2"
11-
futures = "0.3.9"
11+
futures = "0.3.15"
1212
indexmap = "1.0"
1313
linkerd-app-core = { path = "../core" }
1414
linkerd-app-inbound = { path = "../inbound" }

‎linkerd/app/inbound/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Configures and runs the inbound proxy
1212
[dependencies]
1313
bytes = "1"
1414
http = "0.2"
15-
futures = "0.3.9"
15+
futures = "0.3.15"
1616
indexmap = "1.0"
1717
linkerd-app-core = { path = "../core" }
1818
thiserror = "1.0"

‎linkerd/app/inbound/fuzz/Cargo.lock

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ dependencies = [
206206

207207
[[package]]
208208
name = "futures"
209-
version = "0.3.14"
209+
version = "0.3.15"
210210
source = "registry+https://github.com/rust-lang/crates.io-index"
211-
checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
211+
checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
212212
dependencies = [
213213
"futures-channel",
214214
"futures-core",
@@ -221,25 +221,25 @@ dependencies = [
221221

222222
[[package]]
223223
name = "futures-channel"
224-
version = "0.3.14"
224+
version = "0.3.15"
225225
source = "registry+https://github.com/rust-lang/crates.io-index"
226-
checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
226+
checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
227227
dependencies = [
228228
"futures-core",
229229
"futures-sink",
230230
]
231231

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

238238
[[package]]
239239
name = "futures-executor"
240-
version = "0.3.14"
240+
version = "0.3.15"
241241
source = "registry+https://github.com/rust-lang/crates.io-index"
242-
checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
242+
checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
243243
dependencies = [
244244
"futures-core",
245245
"futures-task",
@@ -248,16 +248,17 @@ dependencies = [
248248

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

255255
[[package]]
256256
name = "futures-macro"
257-
version = "0.3.14"
257+
version = "0.3.15"
258258
source = "registry+https://github.com/rust-lang/crates.io-index"
259-
checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
259+
checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
260260
dependencies = [
261+
"autocfg",
261262
"proc-macro-hack",
262263
"proc-macro2",
263264
"quote",
@@ -266,22 +267,23 @@ dependencies = [
266267

267268
[[package]]
268269
name = "futures-sink"
269-
version = "0.3.14"
270+
version = "0.3.15"
270271
source = "registry+https://github.com/rust-lang/crates.io-index"
271-
checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
272+
checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
272273

273274
[[package]]
274275
name = "futures-task"
275-
version = "0.3.14"
276+
version = "0.3.15"
276277
source = "registry+https://github.com/rust-lang/crates.io-index"
277-
checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
278+
checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
278279

279280
[[package]]
280281
name = "futures-util"
281-
version = "0.3.14"
282+
version = "0.3.15"
282283
source = "registry+https://github.com/rust-lang/crates.io-index"
283-
checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
284+
checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
284285
dependencies = [
286+
"autocfg",
285287
"futures-channel",
286288
"futures-core",
287289
"futures-io",

‎linkerd/app/integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ flaky_tests = []
1818

1919
[dependencies]
2020
bytes = "1"
21-
futures = "0.3.9"
21+
futures = "0.3.15"
2222
h2 = "0.3"
2323
http = "0.2"
2424
http-body = "0.4"

‎linkerd/app/outbound/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test-subscriber = []
1717
[dependencies]
1818
bytes = "1"
1919
http = "0.2"
20-
futures = "0.3.9"
20+
futures = "0.3.15"
2121
indexmap = "1.0"
2222
linkerd-app-core = { path = "../core" }
2323
linkerd-http-retry = { path = "../../http-retry" }

‎linkerd/app/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ a dedicated crate to help the compiler cache dependencies properly.
1717
flaky_tests = []
1818

1919
[dependencies]
20-
futures = "0.3.9"
20+
futures = "0.3.15"
2121
h2 = "0.3"
2222
http = "0.2"
2323
http-body = "0.4"

0 commit comments

Comments
 (0)