vbatts
/
cri-o
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1335 from wking/wont-never 

oci: Copy-edits for waitContainerStop chControl comment
This commit is contained in:
Mrunal Patel 2018-02-14 18:01:02 -08:00 committed by GitHub
parent fa8cedf981 db3962cbc9
commit be23a54da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oci/oci.go
View File

@ -563,12 +563,12 @@ func (r *Runtime) UpdateContainer(c *Container, res *rspec.LinuxResources) error
func waitContainerStop(ctx context.Context, c *Container, timeout time.Duration) error {
done := make(chan struct{})
// we could potentially re-use "done" channel to exit the loop on timeout
// but we use another channel "chControl" so that we won't never incur in the
// case the "done" channel is closed in the "default" select case and we also
// reach the timeout in the select below. If that happens we could raise
// a panic closing a closed channel so better be safe and use another new
// channel just to control the loop.
// we could potentially re-use "done" channel to exit the loop on timeout,
// but we use another channel "chControl" so that we never panic
// attempting to close an already-closed "done" channel. The panic
// would occur in the "default" select case below if we'd closed the
// "done" channel (instead of the "chControl" channel) in the timeout
// select case.
chControl := make(chan struct{})
go func() {
for {