Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/1.6] fix pusher concurrent close channel #7562

Merged
merged 1 commit into from Oct 20, 2022
Merged

[release/1.6] fix pusher concurrent close channel #7562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions remotes/docker/pusher.go
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@ import (
"net/http"
"net/url"
"strings"
"sync"
"time"

"github.com/containerd/containerd/content"
Expand Down Expand Up @@ -317,9 +318,10 @@ type pushWriter struct {

pipe *io.PipeWriter

pipeC chan *io.PipeWriter
respC chan *http.Response
errC chan error
pipeC chan *io.PipeWriter
respC chan *http.Response
closeOnce sync.Once
errC chan error

isManifest bool

Expand Down Expand Up @@ -395,14 +397,9 @@ func (pw *pushWriter) Write(p []byte) (n int, err error) {
func (pw *pushWriter) Close() error {
// Ensure pipeC is closed but handle `Close()` being
// called multiple times without panicking
select {
case _, ok := <-pw.pipeC:
if ok {
close(pw.pipeC)
}
default:
pw.closeOnce.Do(func() {
close(pw.pipeC)
}
})
if pw.pipe != nil {
status, err := pw.tracker.GetStatus(pw.ref)
if err == nil && !status.Committed {
Expand Down
8 changes: 4 additions & 4 deletions remotes/docker/pusher_test.go
View file
Open in desktop
Expand Up @@ -293,7 +293,7 @@ func Test_dockerPusher_push(t *testing.T) {
dp dockerPusher
dockerBaseObject string
args args
checkerFunc func(writer pushWriter) bool
checkerFunc func(writer *pushWriter) bool
wantErr error
}{
{
Expand All @@ -306,7 +306,7 @@ func Test_dockerPusher_push(t *testing.T) {
ref: fmt.Sprintf("manifest-%s", manifestContentDigest.String()),
unavailableOnFail: false,
},
checkerFunc: func(writer pushWriter) bool {
checkerFunc: func(writer *pushWriter) bool {
select {
case resp := <-writer.respC:
// 201 should be the response code when uploading a new manifest
Expand Down Expand Up @@ -340,7 +340,7 @@ func Test_dockerPusher_push(t *testing.T) {
ref: fmt.Sprintf("layer-%s", layerContentDigest.String()),
unavailableOnFail: false,
},
checkerFunc: func(writer pushWriter) bool {
checkerFunc: func(writer *pushWriter) bool {
select {
case resp := <-writer.respC:
// 201 should be the response code when uploading a new blob
Expand Down Expand Up @@ -379,7 +379,7 @@ func Test_dockerPusher_push(t *testing.T) {
}

// test whether a proper response has been received after the push operation
assert.True(t, test.checkerFunc(*pw))
assert.True(t, test.checkerFunc(pw))

})
}
Expand Down