Skip to content

Commit 04e95b5

Browse files
Add timeout while waiting for StartTransinetUnit completion signal from dbus
Signed-off-by: vikaschoudhary16 <[email protected]>
1 parent ce80fa0 commit 04e95b5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

libcontainer/cgroups/systemd/apply_systemd.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/opencontainers/runc/libcontainer/cgroups"
1818
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
1919
"github.com/opencontainers/runc/libcontainer/configs"
20+
"github.com/sirupsen/logrus"
2021
)
2122

2223
type Manager struct {
@@ -300,7 +301,11 @@ func (m *Manager) Apply(pid int) error {
300301
return err
301302
}
302303

303-
<-statusChan
304+
select {
305+
case <-statusChan:
306+
case <-time.After(time.Second):
307+
logrus.Warnf("Timed out while waiting for StartTransientUnit completion signal from dbus. Continuing...")
308+
}
304309

305310
if err := joinCgroups(c, pid); err != nil {
306311
return err

0 commit comments

Comments
 (0)