summaryrefslogtreecommitdiff
path: root/vendor/github.com/opencontainers/runc/libcontainer
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-07-23 05:56:00 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-07-30 16:48:18 -0400
commit141c7a5165261b0a75254107b63b2dac22203ebf (patch)
treeaa6b513cf7e28727367ee6d4ba2980fe48bc86f5 /vendor/github.com/opencontainers/runc/libcontainer
parent680a3838748b297b7c3c462f98b58f82e39218e8 (diff)
downloadpodman-141c7a5165261b0a75254107b63b2dac22203ebf.tar.gz
podman-141c7a5165261b0a75254107b63b2dac22203ebf.tar.bz2
podman-141c7a5165261b0a75254107b63b2dac22203ebf.zip
Vendor in buildah 1.9.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer')
-rw-r--r--vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go38
-rw-r--r--vendor/github.com/opencontainers/runc/libcontainer/configs/intelrdt.go4
2 files changed, 37 insertions, 5 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
index 316d963d6..9717acc72 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
@@ -14,6 +14,7 @@ import (
"time"
units "github.com/docker/go-units"
+ "golang.org/x/sys/unix"
)
const (
@@ -464,10 +465,39 @@ func WriteCgroupProc(dir string, pid int) error {
}
// Dont attach any pid to the cgroup if -1 is specified as a pid
- if pid != -1 {
- if err := ioutil.WriteFile(filepath.Join(dir, CgroupProcesses), []byte(strconv.Itoa(pid)), 0700); err != nil {
- return fmt.Errorf("failed to write %v to %v: %v", pid, CgroupProcesses, err)
+ if pid == -1 {
+ return nil
+ }
+
+ cgroupProcessesFile, err := os.OpenFile(filepath.Join(dir, CgroupProcesses), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
+ if err != nil {
+ return fmt.Errorf("failed to write %v to %v: %v", pid, CgroupProcesses, err)
+ }
+ defer cgroupProcessesFile.Close()
+
+ for i := 0; i < 5; i++ {
+ _, err = cgroupProcessesFile.WriteString(strconv.Itoa(pid))
+ if err == nil {
+ return nil
}
+
+ // EINVAL might mean that the task being added to cgroup.procs is in state
+ // TASK_NEW. We should attempt to do so again.
+ if isEINVAL(err) {
+ time.Sleep(30 * time.Millisecond)
+ continue
+ }
+
+ return fmt.Errorf("failed to write %v to %v: %v", pid, CgroupProcesses, err)
+ }
+ return err
+}
+
+func isEINVAL(err error) bool {
+ switch err := err.(type) {
+ case *os.PathError:
+ return err.Err == unix.EINVAL
+ default:
+ return false
}
- return nil
}
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/intelrdt.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/intelrdt.go
index 6f47aac07..57e9f037d 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/configs/intelrdt.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/configs/intelrdt.go
@@ -5,7 +5,9 @@ type IntelRdt struct {
// Format: "L3:<cache_id0>=<cbm0>;<cache_id1>=<cbm1>;..."
L3CacheSchema string `json:"l3_cache_schema,omitempty"`
- // The schema of memory bandwidth percentage per L3 cache id
+ // The schema of memory bandwidth per L3 cache id
// Format: "MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;..."
+ // The unit of memory bandwidth is specified in "percentages" by
+ // default, and in "MBps" if MBA Software Controller is enabled.
MemBwSchema string `json:"memBwSchema,omitempty"`
}