112 lines
3.1 KiB
Diff
112 lines
3.1 KiB
Diff
|
From b5ce74b04b457d54104113c6fc7e507ead3ac26d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vanient <xiadanni1@huawei.com>
|
||
|
|
Date: Mon, 4 Sep 2023 15:36:45 +0800
|
||
|
|
Subject: [PATCH] update cgroup-rs crate
|
||
|
|
|
||
|
|
update cgroup-rs crate to fix "unable to write to a control group file"
|
||
|
|
|
||
|
|
Signed-off-by: Vanient <xiadanni1@huawei.com>
|
||
|
|
---
|
||
|
|
src/agent/Cargo.lock | 25 +++++++++++++++++++------
|
||
|
|
src/agent/Cargo.toml | 2 +-
|
||
|
|
src/agent/rustjail/Cargo.toml | 2 +-
|
||
|
|
3 files changed, 21 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
|
||
|
|
index 87807a3..799eec1 100644
|
||
|
|
--- a/src/agent/Cargo.lock
|
||
|
|
+++ b/src/agent/Cargo.lock
|
||
|
|
@@ -1,5 +1,7 @@
|
||
|
|
# This file is automatically @generated by Cargo.
|
||
|
|
# It is not intended for manual editing.
|
||
|
|
+version = 3
|
||
|
|
+
|
||
|
|
[[package]]
|
||
|
|
name = "addr2line"
|
||
|
|
version = "0.14.0"
|
||
|
|
@@ -147,13 +149,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||
|
|
|
||
|
|
[[package]]
|
||
|
|
name = "cgroups-rs"
|
||
|
|
-version = "0.2.5"
|
||
|
|
+version = "0.2.11"
|
||
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||
|
|
-checksum = "d4cec688ee0fcd143ffd7893ce2c9857bfc656eb1f2a27202244b72f08f5f8ed"
|
||
|
|
+checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2"
|
||
|
|
dependencies = [
|
||
|
|
"libc",
|
||
|
|
"log",
|
||
|
|
- "nix 0.20.0",
|
||
|
|
+ "nix 0.24.3",
|
||
|
|
"regex",
|
||
|
|
]
|
||
|
|
|
||
|
|
@@ -510,9 +512,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||
|
|
|
||
|
|
[[package]]
|
||
|
|
name = "libc"
|
||
|
|
-version = "0.2.91"
|
||
|
|
+version = "0.2.147"
|
||
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||
|
|
-checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
|
||
|
|
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
|
||
|
|
|
||
|
|
[[package]]
|
||
|
|
name = "libflate"
|
||
|
|
@@ -727,6 +729,17 @@ dependencies = [
|
||
|
|
"libc",
|
||
|
|
]
|
||
|
|
|
||
|
|
+[[package]]
|
||
|
|
+name = "nix"
|
||
|
|
+version = "0.24.3"
|
||
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||
|
|
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
|
||
|
|
+dependencies = [
|
||
|
|
+ "bitflags",
|
||
|
|
+ "cfg-if 1.0.0",
|
||
|
|
+ "libc",
|
||
|
|
+]
|
||
|
|
+
|
||
|
|
[[package]]
|
||
|
|
name = "ntapi"
|
||
|
|
version = "0.3.6"
|
||
|
|
@@ -877,7 +890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||
|
|
checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
|
||
|
|
dependencies = [
|
||
|
|
"libc",
|
||
|
|
- "nix 0.19.1",
|
||
|
|
+ "nix 0.20.0",
|
||
|
|
]
|
||
|
|
|
||
|
|
[[package]]
|
||
|
|
diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml
|
||
|
|
index 195b53b..3405827 100644
|
||
|
|
--- a/src/agent/Cargo.toml
|
||
|
|
+++ b/src/agent/Cargo.toml
|
||
|
|
@@ -45,7 +45,7 @@ tempfile = "3.1.0"
|
||
|
|
prometheus = { version = "0.9.0", features = ["process"] }
|
||
|
|
procfs = "0.7.9"
|
||
|
|
anyhow = "1.0.32"
|
||
|
|
-cgroups = { package = "cgroups-rs", version = "0.2.5" }
|
||
|
|
+cgroups = { package = "cgroups-rs", version = "0.2.11" }
|
||
|
|
|
||
|
|
[workspace]
|
||
|
|
members = [
|
||
|
|
diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml
|
||
|
|
index 55e59f4..7d59d2b 100644
|
||
|
|
--- a/src/agent/rustjail/Cargo.toml
|
||
|
|
+++ b/src/agent/rustjail/Cargo.toml
|
||
|
|
@@ -23,7 +23,7 @@ scan_fmt = "0.2"
|
||
|
|
regex = "1.1"
|
||
|
|
path-absolutize = "1.2.0"
|
||
|
|
anyhow = "1.0.32"
|
||
|
|
-cgroups = { package = "cgroups-rs", version = "0.2.5" }
|
||
|
|
+cgroups = { package = "cgroups-rs", version = "0.2.11" }
|
||
|
|
tempfile = "3.1.0"
|
||
|
|
rlimit = "0.5.3"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|