mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 22:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1772 from filbranden/systemd1

Browse Source 
Fix systemd.Apply() to check for DBus error before waiting on a channel.
This commit is contained in:
Michael Crosby
2018-04-10 14:14:48 -04:00
committed by GitHub
parent cc4307ab66 8ab251f298
commit 3cbb2fa3c4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/cgroups/systemd/apply_systemd.go
+7 -7
View File
@@ -297,16 +297,16 @@ func (m *Manager) Apply(pid int) error {
}
statusChan := make(chan string)
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, statusChan); err != nil && !isUnitExists(err) {
if _, err := theConn.StartTransientUnit(unitName, "replace", properties, statusChan); err == nil {
select {
case <-statusChan:
case <-time.After(time.Second):
logrus.Warnf("Timed out while waiting for StartTransientUnit(%s) completion signal from dbus. Continuing...", unitName)
}
} else if !isUnitExists(err) {
return err
}
select {
case <-statusChan:
case <-time.After(time.Second):
logrus.Warnf("Timed out while waiting for StartTransientUnit completion signal from dbus. Continuing...")
}
if err := joinCgroups(c, pid); err != nil {
return err
}