Skip to content

Commit 8ca35c7

Browse files
sjenningk8s-publishing-bot
authored andcommitted
UPSTREAM: revert: 9bf708a: opencontainers/runc: 1754: Add timeout while waiting for StartTransinetUnit completion signal
Origin-commit: 8129858eddc2f1dd95c6ebe26c387245b0e92ef8
1 parent 991e5ae commit 8ca35c7

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

Diff for: libcontainer/cgroups/systemd/apply_systemd.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ 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"
2120
)
2221

2322
type Manager struct {
@@ -301,11 +300,7 @@ func (m *Manager) Apply(pid int) error {
301300
return err
302301
}
303302

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-
}
303+
<-statusChan
309304

310305
if err := joinCgroups(c, pid); err != nil {
311306
return err

0 commit comments

Comments
 (0)