Bump github.com/containers/storage from 1.23.3 to 1.23.4

Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.23.3 to 1.23.4.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.23.3...v1.23.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
dependabot-preview[bot]
2020-09-04 08:14:59 +00:00
committed by Daniel J Walsh
parent 662f9ac8f7
commit c1f984a176
9 changed files with 33 additions and 15 deletions

View File

@@ -1,19 +1,22 @@
language: go
sudo: false
os:
- linux
- osx
go:
- 1.9.x
- 1.10.x
- 1.13.x
- 1.14.x
- 1.15.x
- master
script:
- go test -v -cpu=1,2,4 .
- go test -v -cpu=2 -race -short .
env:
- GO111MODULE=off
script:
- diff <(gofmt -d .) <(printf "")
- go test -v -cpu=1,2,4 .
- go test -v -cpu=2 -race -short .
matrix:
allow_failures:

View File

@@ -331,6 +331,16 @@ func (z *Reader) killReadAhead() error {
// Wait for decompressor to be closed and return error, if any.
e, ok := <-z.closeErr
z.activeRA = false
for blk := range z.readAhead {
if blk.b != nil {
z.blockPool <- blk.b
}
}
if cap(z.current) > 0 {
z.blockPool <- z.current
z.current = nil
}
if !ok {
// Channel is closed, so if there was any error it has already been returned.
return nil
@@ -418,6 +428,7 @@ func (z *Reader) doReadAhead() {
case z.readAhead <- read{b: buf, err: err}:
case <-closeReader:
// Sent on close, we don't care about the next results
z.blockPool <- buf
return
}
if err != nil {