get: Fix reading an object if its size is unknown #694
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
api-get-object.go
Outdated
| return 0, io.EOF | ||
| } | ||
| o.currOffset += offset | ||
| case 2: | ||
| // If we don't the object size, immediately return an error |
There was a problem hiding this comment.
"If we don't know the object size return an error for io.SeekEnd"
|
All comments addressed. |
harshavardhana
previously approved these changes
May 29, 2017
api-stat.go
Outdated
| size, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64) | ||
| if err != nil { | ||
| // Content-Length is not valid, do not verify. | ||
| size = -1 |
There was a problem hiding this comment.
The question "Why are we ignoring ParseInt error" arises in mind, previous code was better. Or you can do:
@@ -126,11 +124,12 @@ func (c Client) statObject(bucketName, objectName string, reqHeaders RequestHead
md5sum := strings.TrimPrefix(resp.Header.Get("ETag"), "\"")
md5sum = strings.TrimSuffix(md5sum, "\"")
- // Content-Length is not valid for Google Cloud Storage, do not verify.
+ // If server does not send Content-Length then we set size to -1.
var size int64 = -1
- if !s3utils.IsGoogleEndpoint(c.endpointURL) {
+ lenStr := resp.Header.Get("Content-Length")
+ if lenStr != "" {
// Parse content length.
- size, err = strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+ size, err = strconv.ParseInt(lenStr, 10, 64)
if err != nil {
return ObjectInfo{}, ErrorResponse{
Code: "InternalError",
Getting an object and reading it doesn't work as expected when S3 server doesn't return the object content length, which happens sometimes with Google Cloud Service.
harshavardhana
approved these changes
Jun 1, 2017
krishnasrinivas
approved these changes
Jun 1, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Getting an object and reading it doesn't work as expected when S3 server
doesn't return the object content length. (though very rare)
Fixes #693