Skip to content

Commit 475af41

Browse files
authored
upgrade tokio to address tokio panic bug [DEVINFRA-645] (#429)
This is part 1 of trying to fix SITL panic bug and it's best effort only as few smaller crates still sit on lower version of tokio The plan is to upgrade Esthri first and cut a new release, the update all dependencies in SITL related bug fix: tokio-rs/tokio#4897
1 parent 0d8f46f commit 475af41

File tree

4 files changed

+74
-17
lines changed

4 files changed

+74
-17
lines changed

Cargo.lock

Lines changed: 69 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ CREDENTIAL_PROVIDER=profile esthri s3 sync s3://esthri-test/myfiles/ mynewdirect
8080
`ESTHRI_CREDENTIAL_PROVIDER=profile` ---> fetched from default credential file
8181
`ESTHRI_CREDENTIAL_PROVIDER=container` ---> fetched from task's IAM role in ECS
8282
`ESTHRI_CREDENTIAL_PROVIDER=instance_metadata` ---> fetched from instance metadata service
83+
`ESTHRI_CREDENTIAL_PROVIDER=k8s` ---> fetched from kubernetes auth service
8384
`ESTHRI_CREDENTIAL_PROVIDER=` ---> explicitly using default credential provider if empty
8485

8586
If not set the program will fall back to default credential provider in which the

crates/esthri-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ once_cell = "1.7"
4646
sanitize-filename = "0.4"
4747
serde = "1"
4848
clap = { version = "3.2.22", features = ["derive", "env"] }
49-
tokio = { version = "1.6", features = ["rt-multi-thread", "signal", "sync"] }
49+
tokio = { version = "1.23.0", features = ["rt-multi-thread", "signal", "sync"] }
5050
tokio-util = { version = "0.7.4", features = ["compat", "codec"] }
5151
warp = "0.3"
5252

crates/esthri/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ regex = "1"
3737
serde = { version = "1", features = ["derive"] }
3838
tempfile = "3"
3939
thiserror = "1"
40-
tokio = { version = "1", features = ["fs", "io-util", "sync", "parking_lot"] }
40+
tokio = { version = "1.23.0", features = ["fs", "io-util", "sync", "parking_lot"] }
4141
tokio-retry = "0.3"
42-
tokio-stream = "0.1"
43-
tokio-util = { version = "0.7", features = ["io"] }
42+
tokio-stream = "0.1.11"
43+
tokio-util = { version = "0.7.4", features = ["io"] }
4444
walkdir = "2"
4545
strum = "0.24.1"
4646
strum_macros = "0.24.3"

0 commit comments

Comments
 (0)