Browse code

Merge pull request #38965 from thaJeztah/bump_cgroups

update containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1

Brian Goff authored on 2019/03/29 14:26:34
Showing 2 changed files
... ...
@@ -123,7 +123,7 @@ google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
123 123
 github.com/containerd/containerd a15b6e2097c48b632dbdc63254bad4c62b69e709
124 124
 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
125 125
 github.com/containerd/continuity 004b46473808b3e7a4a3049c20e4376c91eb966d
126
-github.com/containerd/cgroups dbea6f2bd41658b84b00417ceefa416b979cbf10
126
+github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
127 127
 github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
128 128
 github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
129 129
 github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
... ...
@@ -105,6 +105,10 @@ func Load(hierarchy Hierarchy, path Path, opts ...InitOpts) (Cgroup, error) {
105 105
 		}
106 106
 		activeSubsystems = append(activeSubsystems, s)
107 107
 	}
108
+	// if we do not have any active systems then the cgroup is deleted
109
+	if len(activeSubsystems) == 0 {
110
+		return nil, ErrCgroupDeleted
111
+	}
108 112
 	return &cgroup{
109 113
 		path:       path,
110 114
 		subsystems: activeSubsystems,