Merge pull request #10775 from fidencio/topic/update-ttrpc-crate

agent: Update ttrpc to include the fix for connectivity issues
This commit is contained in:
Fabiano Fidêncio 2025-01-22 17:45:38 +01:00 committed by GitHub
commit 6baa60d77d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 55 additions and 69 deletions

5
src/agent/Cargo.lock generated
View File

@ -6500,14 +6500,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "ttrpc" name = "ttrpc"
version = "0.8.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",
"crossbeam", "crossbeam",
"futures", "futures",
"home",
"libc", "libc",
"log", "log",
"nix 0.26.4", "nix 0.26.4",

View File

@ -12,7 +12,7 @@ oci-spec = { version = "0.6.8", features = ["runtime"] }
rustjail = { path = "rustjail" } rustjail = { path = "rustjail" }
protocols = { path = "../libs/protocols", features = ["async", "with-serde"] } protocols = { path = "../libs/protocols", features = ["async", "with-serde"] }
lazy_static = "1.3.0" lazy_static = "1.3.0"
ttrpc = { version = "0.8", features = ["async"], default-features = false } ttrpc = { version = "0.8.4", features = ["async"], default-features = false }
protobuf = "3.2.0" protobuf = "3.2.0"
libc = "0.2.58" libc = "0.2.58"
nix = "0.24.2" nix = "0.24.2"

14
src/libs/Cargo.lock generated
View File

@ -676,6 +676,15 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "home"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [
"windows-sys 0.52.0",
]
[[package]] [[package]]
name = "http" name = "http"
version = "0.2.8" version = "0.2.8"
@ -2015,14 +2024,15 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]] [[package]]
name = "ttrpc" name = "ttrpc"
version = "0.8.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",
"crossbeam", "crossbeam",
"futures", "futures",
"home",
"libc", "libc",
"log", "log",
"nix 0.26.4", "nix 0.26.4",

View File

@ -11,7 +11,7 @@ with-serde = []
async = ["ttrpc/async", "async-trait"] async = ["ttrpc/async", "async-trait"]
[dependencies] [dependencies]
ttrpc = "0.8" ttrpc = "0.8.4"
async-trait = { version = "0.1.42", optional = true } async-trait = { version = "0.1.42", optional = true }
protobuf = { version = "3.2.0" } protobuf = { version = "3.2.0" }
serde = { version = "1.0.130", features = ["derive"] } serde = { version = "1.0.130", features = ["derive"] }

View File

@ -1579,6 +1579,15 @@ dependencies = [
"digest 0.10.7", "digest 0.10.7",
] ]
[[package]]
name = "home"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [
"windows-sys 0.52.0",
]
[[package]] [[package]]
name = "http" name = "http"
version = "0.2.9" version = "0.2.9"
@ -4426,14 +4435,15 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]] [[package]]
name = "ttrpc" name = "ttrpc"
version = "0.8.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",
"crossbeam", "crossbeam",
"futures 0.3.28", "futures 0.3.28",
"home",
"libc", "libc",
"log", "log",
"nix 0.26.2", "nix 0.26.2",

View File

@ -17,7 +17,7 @@ serde = { version = "^1.0", features = ["derive"] }
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
slog = "2.5.2" slog = "2.5.2"
slog-scope = "4.4.0" slog-scope = "4.4.0"
ttrpc = "0.8" ttrpc = "0.8.4"
tokio = { version = "1.38.0", features = ["fs", "rt"] } tokio = { version = "1.38.0", features = ["fs", "rt"] }
tracing = "0.1.36" tracing = "0.1.36"
url = "2.2.2" url = "2.2.2"

View File

@ -28,7 +28,7 @@ rand = "0.8.4"
path-clean = "1.0.1" path-clean = "1.0.1"
lazy_static = "1.4" lazy_static = "1.4"
tracing = "0.1.36" tracing = "0.1.36"
ttrpc = {version = "0.8.1", features = ["async"] } ttrpc = { version = "0.8.4", features = ["async"] }
protobuf = "3.1.0" protobuf = "3.1.0"
kata-sys-util = { path = "../../../libs/kata-sys-util" } kata-sys-util = { path = "../../../libs/kata-sys-util" }

View File

@ -20,7 +20,7 @@ slog-scope = "4.4.0"
strum = { version = "0.24.0", features = ["derive"] } strum = { version = "0.24.0", features = ["derive"] }
thiserror = "^1.0" thiserror = "^1.0"
tokio = { version = "1.38.0", features = ["rt-multi-thread", "process", "fs"] } tokio = { version = "1.38.0", features = ["rt-multi-thread", "process", "fs"] }
ttrpc = "0.8" ttrpc = "0.8.4"
persist = { path = "../../persist" } persist = { path = "../../persist" }
agent = { path = "../../agent" } agent = { path = "../../agent" }
kata-sys-util = { path = "../../../../libs/kata-sys-util" } kata-sys-util = { path = "../../../../libs/kata-sys-util" }

View File

@ -12,7 +12,7 @@ slog = "2.5.2"
slog-scope = "4.4.0" slog-scope = "4.4.0"
tokio = { version = "1.38.0", features = ["rt-multi-thread"] } tokio = { version = "1.38.0", features = ["rt-multi-thread"] }
tracing = "0.1.36" tracing = "0.1.36"
ttrpc = "0.8" ttrpc = "0.8.4"
common = { path = "../runtimes/common" } common = { path = "../runtimes/common" }
containerd-shim-protos = { version = "0.6.0", features = ["async"] } containerd-shim-protos = { version = "0.6.0", features = ["async"] }

View File

@ -2212,7 +2212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"windows-targets 0.48.0", "windows-targets 0.52.6",
] ]
[[package]] [[package]]
@ -4556,12 +4556,13 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "ttrpc" name = "ttrpc"
version = "0.8.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"crossbeam", "crossbeam",
"home",
"libc", "libc",
"log", "log",
"nix 0.26.4", "nix 0.26.4",
@ -4904,7 +4905,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]

View File

@ -33,7 +33,7 @@ log = "0.4.22"
nix = "0.23.0" nix = "0.23.0"
libc = "0.2.112" libc = "0.2.112"
# XXX: Must be the same as the version used by the agent # XXX: Must be the same as the version used by the agent
ttrpc = "0.8" ttrpc = "0.8.4"
# For parsing timeouts # For parsing timeouts
humantime = "2.1.0" humantime = "2.1.0"

View File

@ -827,11 +827,11 @@ dependencies = [
[[package]] [[package]]
name = "home" name = "home"
version = "0.5.5" version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -2455,12 +2455,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]] [[package]]
name = "ttrpc" name = "ttrpc"
version = "0.8.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"crossbeam", "crossbeam",
"home",
"libc", "libc",
"log", "log",
"nix", "nix",

View File

@ -36,7 +36,7 @@ dependencies = [
"slog-scope", "slog-scope",
"tokio", "tokio",
"tracing", "tracing",
"ttrpc 0.8.1", "ttrpc",
"url", "url",
] ]
@ -952,11 +952,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]] [[package]]
name = "home" name = "home"
version = "0.5.5" version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -1211,7 +1211,7 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"toml", "toml",
"ttrpc 0.6.1", "ttrpc",
"url", "url",
"vmm-sys-util", "vmm-sys-util",
] ]
@ -1415,19 +1415,6 @@ dependencies = [
"tempfile", "tempfile",
] ]
[[package]]
name = "nix"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
dependencies = [
"bitflags 1.3.2",
"cc",
"cfg-if",
"libc",
"memoffset 0.6.5",
]
[[package]] [[package]]
name = "nix" name = "nix"
version = "0.24.3" version = "0.24.3"
@ -1904,16 +1891,6 @@ dependencies = [
"thiserror", "thiserror",
] ]
[[package]]
name = "protobuf-codegen-pure"
version = "2.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865"
dependencies = [
"protobuf 2.28.0",
"protobuf-codegen 2.28.0",
]
[[package]] [[package]]
name = "protobuf-parse" name = "protobuf-parse"
version = "3.3.0" version = "3.3.0"
@ -1948,7 +1925,7 @@ dependencies = [
"protobuf 3.3.0", "protobuf 3.3.0",
"serde", "serde",
"serde_json", "serde_json",
"ttrpc 0.8.1", "ttrpc",
"ttrpc-codegen", "ttrpc-codegen",
] ]
@ -3046,29 +3023,15 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]] [[package]]
name = "ttrpc" name = "ttrpc"
version = "0.6.1" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ecfff459a859c6ba6668ff72b34c2f1d94d9d58f7088414c2674ad0f31cc7d8" checksum = "2c580c498a547b4c083ec758be543e11a0772e03013aef4cdb1fbe77c8b62cae"
dependencies = [
"byteorder",
"libc",
"log",
"nix 0.23.2",
"protobuf 2.28.0",
"protobuf-codegen-pure",
"thiserror",
]
[[package]]
name = "ttrpc"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",
"crossbeam", "crossbeam",
"futures", "futures",
"home",
"libc", "libc",
"log", "log",
"nix 0.26.4", "nix 0.26.4",

View File

@ -45,7 +45,7 @@ slog = "2.7.0"
slog-scope = "4.4.0" slog-scope = "4.4.0"
hyper = "0.14.20" hyper = "0.14.20"
tokio = { version = "1.28.1", features = ["signal"] } tokio = { version = "1.28.1", features = ["signal"] }
ttrpc = "0.6.0" ttrpc = "0.8.4"
prometheus = { version = "0.13.0", features = ["process"] } prometheus = { version = "0.13.0", features = ["process"] }
procfs = "0.12.0" procfs = "0.12.0"