Merge pull request #3423 from crosbymichael/update-cgroups

Update cgroups to c4b9ac5c7601384c965b9646fc51588

vendor.conf

@@ -1,6 +1,6 @@
 github.com/containerd/go-runc 9007c2405372fe28918845901a3276c0915689a1
 github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
-github.com/containerd/cgroups 51b62d303d381950f7b51cf8ff52f1e9e49cc4f1
+github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
 github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
 github.com/containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877

vendor/github.com/containerd/cgroups/blkio.go

@@ -86,6 +86,7 @@ func (b *blkioController) Stat(path string, stats *Metrics) error {
 	}
 	// Try to read CFQ stats available on all CFQ enabled kernels first
 	if _, err := os.Lstat(filepath.Join(b.Path(path), fmt.Sprintf("blkio.io_serviced_recursive"))); err == nil {
+		settings = []blkioStatSettings{}
 		settings = append(settings,
 			blkioStatSettings{
 				name:  "sectors_recursive",

vendor/github.com/containerd/cgroups/cgroup.go

@@ -497,6 +497,9 @@ func (c *cgroup) MoveTo(destination Cgroup) error {
 		}
 		for _, p := range processes {
 			if err := destination.Add(p); err != nil {
+				if strings.Contains(err.Error(), "no such process") {
+					continue
+				}
 				return err
 			}
 		}

vendor/github.com/containerd/cgroups/memory.go

@@ -281,6 +281,10 @@ func getMemorySettings(resources *specs.LinuxResources) []memorySettings {
 			name:  "limit_in_bytes",
 			value: mem.Limit,
 		},
+		{
+			name: "soft_limit_in_bytes",
+			value: mem.Reservation,
+		},
 		{
 			name:  "memsw.limit_in_bytes",
 			value: mem.Swap,