Skip to content

Commit 77360e6

Browse files
committed
added debug info
1 parent 5ddf06c commit 77360e6

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

gs/open.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func (s *storager) Open(ctx context.Context, location string, options ...storage
1818
return reader, err
1919
}
2020

21-
//Open return content reader and hash values if md5 or crc option is supplied or error
21+
// Open return content reader and hash values if md5 or crc option is supplied or error
2222
func (s *storager) open(ctx context.Context, location string, options []storage.Option) (io.ReadCloser, error) {
2323
location = strings.Trim(location, "/")
2424
call := s.Objects.Get(s.bucket, location)
@@ -58,8 +58,12 @@ func (s *storager) open(ctx context.Context, location string, options []storage.
5858
var response *nhttp.Response
5959
err = runWithRetries(ctx, func() error {
6060
response, err = call.Download()
61+
if err != nil && response != nil && response.Body != nil {
62+
response.Body.Close()
63+
}
6164
return err
6265
}, s)
66+
6367
if err != nil {
6468
return nil, errors.Wrapf(err, "failed to open gs://%v/%v ", s.bucket, location)
6569
}

gs/reader.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,17 @@ func (t *reader) Read(dest []byte) (int, error) {
4444
var err error
4545
err = runWithRetries(t.ctx, func() error {
4646
response, err = t.call.Download()
47+
if err != nil && response != nil && response.Body != nil {
48+
response.Body.Close()
49+
}
4750
return err
4851
}, t.storager)
52+
if response.Body != nil {
53+
defer response.Body.Close()
54+
}
4955
if err != nil {
5056
return 0, err
5157
}
52-
defer response.Body.Close()
5358
readSoFar := 0
5459
for {
5560
read, err := response.Body.Read(dest[readSoFar:])
@@ -67,7 +72,7 @@ func (t *reader) Read(dest []byte) (int, error) {
6772
return readSoFar, nil
6873
}
6974

70-
//NewReadSeeker create a reader seeker
75+
// NewReadSeeker create a reader seeker
7176
func NewReadSeeker(ctx context.Context, storager *storager, call *storage.ObjectsGetCall, size int) io.ReadSeeker {
7277
return &reader{
7378
ctx: ctx,

0 commit comments

Comments
 (0)