github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2971 from jterry75/runhcs_shim_exec_deadlock

Browse Source 
Fix deadlock in Windows runhcs shim exec
This commit is contained in:
Michael Crosby 2019-02-01 14:34:57 -05:00 committed by GitHub
commit 18a8a061cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/v2/runhcs/process.go
View File

@ -53,13 +53,17 @@ func newProcess(ctx context.Context, s *service, id string, pid uint32, pr *pipe
relay: pr, relay: pr,
waitBlock: make(chan struct{}), waitBlock: make(chan struct{}),
} }
process.startedWg.Add(1)
go waitForProcess(ctx, process, p, s) go waitForProcess(ctx, process, p, s)
return process, nil return process, nil
} }
// waitForProcess waits for `p` to exit.
//
// The caller of `waitForProcess` MUST have incremented `process.startedWg` to
// synchronize event start/exit publishing.
func waitForProcess(ctx context.Context, process *process, p *os.Process, s *service) { func waitForProcess(ctx context.Context, process *process, p *os.Process, s *service) {
pid := uint32(p.Pid) pid := uint32(p.Pid)
process.startedWg.Add(1)
// Store the default non-exited value for calls to stat // Store the default non-exited value for calls to stat
process.exit.Store(&processExit{ process.exit.Store(&processExit{
@ -121,7 +125,6 @@ func newExecProcess(ctx context.Context, s *service, cid, id string, pr *pipeRel
relay: pr, relay: pr,
waitBlock: make(chan struct{}), waitBlock: make(chan struct{}),
} }
process.startedWg.Add(1)
// Store the default non-exited value for calls to stat // Store the default non-exited value for calls to stat
process.exit.Store(&processExit{ process.exit.Store(&processExit{

11
runtime/v2/runhcs/service.go
View File

@ -682,6 +682,17 @@ func (s *service) Start(ctx context.Context, r *taskAPI.StartRequest) (*taskAPI.
} }
} }
// For the exec case increment the startedWg to make sure we publish the
// started event previous to the exit published in `waitForProcess`.
p.startedWg.Add(1)
defer func() {
if err != nil {
// If an exec failure takes place decrement the startedWg so we
// dont get off on counts.
p.startedWg.Done()
}
}()
// ID here is the containerID to exec the process in. // ID here is the containerID to exec the process in.
err = rhcs.Exec(ctx, r.ID, procConfig, eopts) err = rhcs.Exec(ctx, r.ID, procConfig, eopts)
if err != nil { if err != nil {