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.

Sign up for GitHub

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

Jump to bottom

driver/docker: ignore error if container exists before cgroup can be written #10416

Merged
merged 1 commit into from
Jun 9, 2021
Merged

driver/docker: ignore error if container exists before cgroup can be written #10416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion drivers/docker/driver_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
package docker

import (
"strings"

"github.com/opencontainers/runc/libcontainer/cgroups"
)

func setCPUSetCgroup(path string, pid int) error {
return cgroups.WriteCgroupProc(path, pid)
// Sometimes the container exists before we can write the
// cgroup resulting in an error which can be ignored.
if err := cgroups.WriteCgroupProc(path, pid); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't recall the semantics of children processes and WriteCgroupProc. Is there a risk that we may miss some children processes here? Like if PID 1 is a entrypoint script and launches the main process without using exec, the main process may not be included in the cpusets?

if strings.Contains(err.Error(), "no such process") {
return nil
}
return err
}
return nil
}