added debug info

viant · Feb 6, 2024 · 77360e6 · 77360e6
1 parent 5ddf06c
commit 77360e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/gs/open.go b/gs/open.go
@@ -18,7 +18,7 @@ func (s *storager) Open(ctx context.Context, location string, options ...storage
 	return reader, err
 }
 
-//Open return content reader and hash values if md5 or crc option is supplied or error
+// Open return content reader and hash values if md5 or crc option is supplied or error
 func (s *storager) open(ctx context.Context, location string, options []storage.Option) (io.ReadCloser, error) {
 	location = strings.Trim(location, "/")
 	call := s.Objects.Get(s.bucket, location)
@@ -58,8 +58,12 @@ func (s *storager) open(ctx context.Context, location string, options []storage.
 	var response *nhttp.Response
 	err = runWithRetries(ctx, func() error {
 		response, err = call.Download()
+		if err != nil && response != nil && response.Body != nil {
+			response.Body.Close()
+		}
 		return err
 	}, s)
+
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to open gs://%v/%v ", s.bucket, location)
 	}

diff --git a/gs/reader.go b/gs/reader.go
@@ -44,12 +44,17 @@ func (t *reader) Read(dest []byte) (int, error) {
 	var err error
 	err = runWithRetries(t.ctx, func() error {
 		response, err = t.call.Download()
+		if err != nil && response != nil && response.Body != nil {
+			response.Body.Close()
+		}
 		return err
 	}, t.storager)
+	if response.Body != nil {
+		defer response.Body.Close()
+	}
 	if err != nil {
 		return 0, err
 	}
-	defer response.Body.Close()
 	readSoFar := 0
 	for {
 		read, err := response.Body.Read(dest[readSoFar:])
@@ -67,7 +72,7 @@ func (t *reader) Read(dest []byte) (int, error) {
 	return readSoFar, nil
 }
 
-//NewReadSeeker create a reader seeker
+// NewReadSeeker create a reader seeker
 func NewReadSeeker(ctx context.Context, storager *storager, call *storage.ObjectsGetCall, size int) io.ReadSeeker {
 	return &reader{
 		ctx:      ctx,