Skip to content

Commit 2a04669

Browse files
committed
merge branch 'pr-2446'
Kir Kolyshkin (1): (*initProcess).start: rm second Apply LGTMs: @mrunalp @cyphar Closes #2446
2 parents 0853956 + d1ba8e3 commit 2a04669

1 file changed

Lines changed: 1 addition & 10 deletions

File tree

libcontainer/process_linux.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -346,16 +346,7 @@ func (p *initProcess) start() (retErr error) {
346346
return newSystemErrorWithCausef(err, "getting pipe fds for pid %d", childPid)
347347
}
348348
p.setExternalDescriptors(fds)
349-
// Do this before syncing with child so that no children
350-
// can escape the cgroup
351-
if err := p.manager.Apply(childPid); err != nil {
352-
return newSystemErrorWithCause(err, "applying cgroup configuration for process")
353-
}
354-
if p.intelRdtManager != nil {
355-
if err := p.intelRdtManager.Apply(childPid); err != nil {
356-
return newSystemErrorWithCause(err, "applying Intel RDT configuration for process")
357-
}
358-
}
349+
359350
// Now it's time to setup cgroup namesapce
360351
if p.config.Config.Namespaces.Contains(configs.NEWCGROUP) && p.config.Config.Namespaces.PathOf(configs.NEWCGROUP) == "" {
361352
if _, err := p.messageSockPair.parent.Write([]byte{createCgroupns}); err != nil {

0 commit comments

Comments
 (0)