Merge pull request #1754 from vikaschoudhary16/add-timeout

Add timeout while waiting for StartTransinetUnit completion signal
This commit is contained in:
Qiang Huang
2018-03-08 09:09:34 +08:00
committed by GitHub
@@ -17,6 +17,7 @@ import (
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/sirupsen/logrus"
)
type Manager struct {
@@ -300,7 +301,11 @@ func (m *Manager) Apply(pid int) error {
return err
}
<-statusChan
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