jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1683 from vikaschoudhary16/runc-systemd-race 

Fix race against systemd
This commit is contained in:
Qiang Huang 2018-01-09 09:30:58 +08:00 committed by GitHub
parent e6516b3d5d d5b4a3eddb
commit 96086e56f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -295,10 +295,13 @@ func (m *Manager) Apply(pid int) error {
} }
} }
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, nil); err != nil && !isUnitExists(err) { statusChan := make(chan string)
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, statusChan); err != nil && !isUnitExists(err) {
return err return err
} }
<-statusChan
if err := joinCgroups(c, pid); err != nil { if err := joinCgroups(c, pid); err != nil {
return err return err
} }