Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support configure cpu.idle by Cgroupfs #908

Merged
merged 3 commits into from
May 11, 2022
Merged

support configure cpu.idle by Cgroupfs #908

merged 3 commits into from
May 11, 2022

Conversation

wineway
Copy link
Contributor

@wineway wineway commented May 9, 2022

No description provided.

@@ -29,7 +29,7 @@ libc = "0.2.125"
log = "0.4"
mio = { version = "0.8.3", features = ["os-ext", "os-poll"] }
nix = "0.24.1"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af" }
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
oci-spec = "0.5.6"

@@ -25,7 +25,7 @@ libcontainer = { version = "0.0.3", path = "../libcontainer" }
liboci-cli = { version = "0.0.3", path = "../liboci-cli" }
log = { version = "0.4", features = ["std"]}
nix = "0.24.1"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af" }
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
oci-spec = "0.5.6"

@@ -43,7 +43,7 @@ wasmer = { version = "2.2.0", optional = true }
wasmer-wasi = { version = "2.2.0", optional = true }

[dev-dependencies]
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af", features = ["proptests"] }
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests"] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests"] }
oci-spec = { version = "0.5.6", features = ["proptests"] }

@@ -25,7 +25,7 @@ nix = "0.24.1"
procfs = "0.12.0"
log = "0.4"
anyhow = "1.0"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af" }
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
oci-spec = "0.5.6"

@@ -35,7 +35,7 @@ errno = { version = "0.2.8", optional = true }
libc = { version = "0.2.125", optional = true }

[dev-dependencies]
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af", features = ["proptests"] }
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests"] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests"] }
oci-spec = { version = "0.5.6", features = ["proptests"] }

Copy link
Member

@utam0k utam0k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wineway Thanks for your first contribution. I left some comments. If you are okay, please add some integration tests? If you don't have time to add it, please tell me.
https://github.com/containers/youki/tree/main/tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu

crates/libcgroups/src/v1/cpu.rs Show resolved Hide resolved
crates/libcgroups/src/v2/cpu.rs Show resolved Hide resolved
Signed-off-by: wineway <wangyuweihx@gmail.com>
Signed-off-by: wineway <wangyuweihx@gmail.com>
@wineway
Copy link
Contributor Author

wineway commented May 10, 2022

@utam0k @tsturzl updated! PTAL

and seems tag 0.5.6 doesn't contains youki-dev/oci-spec-rs#103, so I edited commit message

@utam0k
Copy link
Member

utam0k commented May 10, 2022

and seems tag 0.5.6 doesn't contains youki-dev/oci-spec-rs#103, so I edited commit messa

Oops, sorry, I failed to include your PR when I released oci-spec-rs 😭

Copy link
Member

@utam0k utam0k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

Signed-off-by: wineway <wangyuweihx@gmail.com>
@wineway
Copy link
Contributor Author

wineway commented May 11, 2022

@utam0k Can you help trigger ci again? I don't have a cgroupv1 env, and I would like to ensure integration test is correct😂

@utam0k
Copy link
Member

utam0k commented May 11, 2022

@tsturzl Can I ask you to review it again?

@tsturzl
Copy link
Collaborator

tsturzl commented May 11, 2022

@utam0k @wineway LGTM 🚀

@utam0k utam0k merged commit 84bb363 into youki-dev:main May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants