Skip to content

Commit ac8f769

Browse files
authored
Merge pull request containerd#9999 from laurazard/fix-exec-concurrent-shim
runc-shim: only defer init process exits
2 parents d0cdb23 + 6d00c3a commit ac8f769

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cmd/containerd-shim-runc-v2/task/service.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,8 @@ func (s *service) processExits() {
678678
// process.
679679
var cps, skipped []containerProcess
680680
for _, cp := range s.running[e.Pid] {
681-
if s.pendingExecs[cp.Container] != 0 {
681+
_, init := cp.Process.(*process.Init)
682+
if init && s.pendingExecs[cp.Container] != 0 {
682683
// This exit relates to a container for which we have pending execs. In
683684
// order to ensure order between execs and the init process for a given
684685
// container, skip processing this exit here and let the `handleStarted`

0 commit comments

Comments
 (0)