Skip to content

Commit

Permalink
upgrade tokio to address tokio panic bug [DEVINFRA-645] (#429)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gborough committed Jan 3, 2023
1 parent 0d8f46f commit 475af41
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 17 deletions.
82 changes: 69 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Expand Up @@ -80,6 +80,7 @@ CREDENTIAL_PROVIDER=profile esthri s3 sync s3://esthri-test/myfiles/ mynewdirect
`ESTHRI_CREDENTIAL_PROVIDER=profile` ---> fetched from default credential file
`ESTHRI_CREDENTIAL_PROVIDER=container` ---> fetched from task's IAM role in ECS
`ESTHRI_CREDENTIAL_PROVIDER=instance_metadata` ---> fetched from instance metadata service
`ESTHRI_CREDENTIAL_PROVIDER=k8s` ---> fetched from kubernetes auth service
`ESTHRI_CREDENTIAL_PROVIDER=` ---> explicitly using default credential provider if empty

If not set the program will fall back to default credential provider in which the
Expand Down
2 changes: 1 addition & 1 deletion crates/esthri-cli/Cargo.toml
Expand Up @@ -46,7 +46,7 @@ once_cell = "1.7"
sanitize-filename = "0.4"
serde = "1"
clap = { version = "3.2.22", features = ["derive", "env"] }
tokio = { version = "1.6", features = ["rt-multi-thread", "signal", "sync"] }
tokio = { version = "1.23.0", features = ["rt-multi-thread", "signal", "sync"] }
tokio-util = { version = "0.7.4", features = ["compat", "codec"] }
warp = "0.3"

Expand Down
6 changes: 3 additions & 3 deletions crates/esthri/Cargo.toml
Expand Up @@ -37,10 +37,10 @@ regex = "1"
serde = { version = "1", features = ["derive"] }
tempfile = "3"
thiserror = "1"
tokio = { version = "1", features = ["fs", "io-util", "sync", "parking_lot"] }
tokio = { version = "1.23.0", features = ["fs", "io-util", "sync", "parking_lot"] }
tokio-retry = "0.3"
tokio-stream = "0.1"
tokio-util = { version = "0.7", features = ["io"] }
tokio-stream = "0.1.11"
tokio-util = { version = "0.7.4", features = ["io"] }
walkdir = "2"
strum = "0.24.1"
strum_macros = "0.24.3"
Expand Down

0 comments on commit 475af41

Please sign in to comment.