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

Fix content.ReaderAt close

Browse Source 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
This commit is contained in:
Shiming Zhang 2021-05-08 12:30:16 +08:00
parent 01ca105b6a
commit b890f056e8
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/ctr/commands/snapshots/snapshots.go
View File

@ -164,6 +164,7 @@ var diffCommand = cli.Command{
if err != nil { if err != nil {
return err return err
} }
defer ra.Close()
_, err = io.Copy(os.Stdout, content.NewReader(ra)) _, err = io.Copy(os.Stdout, content.NewReader(ra))
return err return err

1
content/testsuite/testsuite.go
View File

@ -780,6 +780,7 @@ func checkSmallBlob(ctx context.Context, t *testing.T, store content.Store) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer ra.Close()
r := io.NewSectionReader(ra, 0, readSize) r := io.NewSectionReader(ra, 0, readSize)
b, err := ioutil.ReadAll(r) b, err := ioutil.ReadAll(r)
if err != nil { if err != nil {

4
images/archive/importer.go
View File

@ -281,6 +281,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string
} }
s, err := compression.DecompressStream(content.NewReader(ra)) s, err := compression.DecompressStream(content.NewReader(ra))
if err != nil { if err != nil {
ra.Close()
return nil, errors.Wrapf(err, "failed to detect compression for %q", layerFiles[i]) return nil, errors.Wrapf(err, "failed to detect compression for %q", layerFiles[i])
} }
if s.GetCompression() == compression.Uncompressed { if s.GetCompression() == compression.Uncompressed {
@ -292,6 +293,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string
layers[i], err = compressBlob(ctx, store, s, ref, content.WithLabels(labels)) layers[i], err = compressBlob(ctx, store, s, ref, content.WithLabels(labels))
if err != nil { if err != nil {
s.Close() s.Close()
ra.Close()
return nil, err return nil, err
} }
layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip
@ -302,7 +304,7 @@ func resolveLayers(ctx context.Context, store content.Store, layerFiles []string
layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip layers[i].MediaType = images.MediaTypeDockerSchema2LayerGzip
} }
s.Close() s.Close()
ra.Close()
} }
return layers, nil return layers, nil
} }

3
install.go
View File

@ -66,6 +66,7 @@ func (c *Client) Install(ctx context.Context, image Image, opts ...InstallOpts)
cr := content.NewReader(ra) cr := content.NewReader(ra)
r, err := compression.DecompressStream(cr) r, err := compression.DecompressStream(cr)
if err != nil { if err != nil {
ra.Close()
return err return err
} }
if _, err := archive.Apply(ctx, path, r, archive.WithFilter(func(hdr *tar.Header) (bool, error) { if _, err := archive.Apply(ctx, path, r, archive.WithFilter(func(hdr *tar.Header) (bool, error) {
@ -87,9 +88,11 @@ func (c *Client) Install(ctx context.Context, image Image, opts ...InstallOpts)
return result, nil return result, nil
})); err != nil { })); err != nil {
r.Close() r.Close()
ra.Close()
return err return err
} }
r.Close() r.Close()
ra.Close()
} }
return nil return nil
} }