Merge pull request #1754 from vikaschoudhary16/add-timeout

Add timeout while waiting for StartTransinetUnit completion signal
opencontainers · Mar 8, 2018 · 9facb87 · 9facb87
2 parents 108570c + 04e95b5
commit 9facb87
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -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