From 5d37d31ac7d980ceafb3375c5f158e4ea2661737 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Tue, 7 Feb 2023 17:53:23 +0800 Subject: [PATCH] cgroups: upgrade cgroupfs to 0.3.1 Trait method cause for std::error::Error is deprecated thus need replace it with source method for cgroups-fs::error::ErrorKind. Fixes: #6192 Signed-off-by: Jianyong Wu --- src/agent/Cargo.lock | 4 ++-- src/agent/Cargo.toml | 2 +- src/agent/rustjail/Cargo.toml | 2 +- src/libs/Cargo.lock | 23 ++++++++++++++++++----- src/libs/kata-sys-util/Cargo.toml | 2 +- src/runtime-rs/Cargo.lock | 4 ++-- src/runtime-rs/crates/resource/Cargo.toml | 2 +- src/tools/runk/Cargo.lock | 4 ++-- src/tools/runk/libcontainer/Cargo.toml | 2 +- 9 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 75c4cc0fd5..0de4591161 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -276,9 +276,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b97b639839204a6eb727ffbbd68e1dcfc55488c3a26cb0cda1d662b7a186e79" +checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1" dependencies = [ "libc", "log", diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 1c391492c8..8851798fd0 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -51,7 +51,7 @@ log = "0.4.11" prometheus = { version = "0.13.0", features = ["process"] } procfs = "0.12.0" anyhow = "1.0.32" -cgroups = { package = "cgroups-rs", version = "0.3.0" } +cgroups = { package = "cgroups-rs", version = "0.3.1" } # Tracing tracing = "0.1.26" diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml index 4d60c11dc1..d4ba4e6f31 100644 --- a/src/agent/rustjail/Cargo.toml +++ b/src/agent/rustjail/Cargo.toml @@ -25,7 +25,7 @@ scan_fmt = "0.2.6" regex = "1.5.6" path-absolutize = "1.2.0" anyhow = "1.0.32" -cgroups = { package = "cgroups-rs", version = "0.3.0" } +cgroups = { package = "cgroups-rs", version = "0.3.1" } rlimit = "0.5.3" cfg-if = "0.1.0" diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock index c1f73d21bc..e0c1296a25 100644 --- a/src/libs/Cargo.lock +++ b/src/libs/Cargo.lock @@ -110,14 +110,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b827f9d9f6c2fff719d25f5d44cbc8d2ef6df1ef00d055c5c14d5dc25529579" +checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1" dependencies = [ "libc", "log", - "nix 0.23.1", + "nix 0.25.1", "regex", + "thiserror", ] [[package]] @@ -536,9 +537,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.124" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -640,6 +641,18 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "libc", +] + [[package]] name = "ntapi" version = "0.3.7" diff --git a/src/libs/kata-sys-util/Cargo.toml b/src/libs/kata-sys-util/Cargo.toml index a4b67e2c09..efcde317e5 100644 --- a/src/libs/kata-sys-util/Cargo.toml +++ b/src/libs/kata-sys-util/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] byteorder = "1.4.3" -cgroups = { package = "cgroups-rs", version = "0.3.0" } +cgroups = { package = "cgroups-rs", version = "0.3.1" } chrono = "0.4.0" common-path = "=1.0.0" fail = "0.5.0" diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock index bb43258616..6842ffb59b 100644 --- a/src/runtime-rs/Cargo.lock +++ b/src/runtime-rs/Cargo.lock @@ -401,9 +401,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b97b639839204a6eb727ffbbd68e1dcfc55488c3a26cb0cda1d662b7a186e79" +checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1" dependencies = [ "libc", "log", diff --git a/src/runtime-rs/crates/resource/Cargo.toml b/src/runtime-rs/crates/resource/Cargo.toml index 98714a7c23..7ae1f799f2 100644 --- a/src/runtime-rs/crates/resource/Cargo.toml +++ b/src/runtime-rs/crates/resource/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "^1.0" async-trait = "0.1.48" bitflags = "1.2.1" byte-unit = "4.0.14" -cgroups-rs = "0.3.0" +cgroups-rs = "0.3.1" futures = "0.3.11" lazy_static = "1.4.0" libc = ">=0.2.39" diff --git a/src/tools/runk/Cargo.lock b/src/tools/runk/Cargo.lock index 582a9e54e9..9a8e92748a 100644 --- a/src/tools/runk/Cargo.lock +++ b/src/tools/runk/Cargo.lock @@ -233,9 +233,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b97b639839204a6eb727ffbbd68e1dcfc55488c3a26cb0cda1d662b7a186e79" +checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1" dependencies = [ "libc", "log", diff --git a/src/tools/runk/libcontainer/Cargo.toml b/src/tools/runk/libcontainer/Cargo.toml index 83f6a3699d..82e56b06ed 100644 --- a/src/tools/runk/libcontainer/Cargo.toml +++ b/src/tools/runk/libcontainer/Cargo.toml @@ -20,7 +20,7 @@ chrono = { version = "0.4.19", features = ["serde"] } serde = { version = "1.0.133", features = ["derive"] } serde_json = "1.0.74" scopeguard = "1.1.0" -cgroups = { package = "cgroups-rs", version = "0.3.0" } +cgroups = { package = "cgroups-rs", version = "0.3.1" } procfs = "0.14.0" [dev-dependencies]