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

return error if libcontainer desroy failed #4090

Closed
wants to merge 1 commit into from

Conversation

Burning1020
Copy link
Contributor

If there is an error in the destroy of libcontainer, it should be returned immediately and let the upper caller decided how to handle it.

Fix #4040

@Burning1020
Copy link
Contributor Author

/cc @kolyshkin @lifubang

@lifubang lifubang added this to the 1.2.0 milestone Oct 23, 2023
@lifubang
Copy link
Member

Please fix the lint error, you can see 48ff07c
Once your PR merged, I will rebase my PR.

@Burning1020 Burning1020 force-pushed the fix-cgroup-path branch 2 times, most recently from fd712f2 to 79e0ea4 Compare October 30, 2023 01:32
@Burning1020
Copy link
Contributor Author

Please fix the lint error, you can see 48ff07c Once your PR merged, I will rebase my PR.

Done.

@@ -18,7 +18,7 @@ func killContainer(container *libcontainer.Container) error {
for i := 0; i < 100; i++ {
time.Sleep(100 * time.Millisecond)
if err := container.Signal(unix.Signal(0)); err != nil {
destroy(container)
_ = destroy(container)
Copy link
Member

Choose a reason for hiding this comment

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

Why ignore the error here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just keep others unchanged to make the minimum changes.

@lifubang
Copy link
Member

Another thing, please use git rebase main instead of git merge main.

@Burning1020
Copy link
Contributor Author

Burning1020 commented Oct 31, 2023

Another thing, please use git rebase main instead of git merge main.

Yes, I got it. The merge main commit is generated automatically by an "Update" button on Github pages.

I should not click it the next time I saw it.

@Burning1020
Copy link
Contributor Author

@lifubang Can you help retry the ci?

@Burning1020
Copy link
Contributor Author

@lifubang @kolyshkin Does this pr need to be improved? I'm more concerned about the feasibility of the repair, not the time being merged.

@Burning1020
Copy link
Contributor Author

Ping @lifubang @kolyshkin

@lifubang
Copy link
Member

lifubang commented Nov 6, 2023

Sorry, we are still in discussion.

@kolyshkin
Copy link
Contributor

Yes, I think we should do this. I have written a similar commit in #4102 and put you (@Burning1020) as a co-author as you wrote it first; PTAL.

@kolyshkin
Copy link
Contributor

Closing in favor of #4102

@kolyshkin kolyshkin closed this Nov 28, 2023
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.

HostPID Pod Container Cgroup path was residual after container restarts
3 participants