upload: restore behavior when ifGenerationMatch=0 for the fs backend #745
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
This change is a follow-up to #735: previously, ifGenerationMatch=0 was special-cased and the server used GetObject, which works on filesystem and memory backends. That pull request changed the code to use GetObjectWithGeneration, which is not supported by the filesystem backend. We couldn't catch this in tests because the test suite only runs with the memory backend, so as part of this change I'm also including the ability to use the filesystem storage in the test suite. That can get slow though. This is a hack and should be revisited once we implement #744.
|
@orsinium can you confirm that this works for you? If so, I can go ahead and merge this PR, then tag a new release. |
fsouza
commented
Apr 8, 2022
Comment on lines
-163
to
+171
| _, err = s.backend.GetObjectWithGeneration(bucketName, objectName, gen) | ||
| if gen == 0 { | ||
| _, err := s.backend.GetObject(bucketName, objectName) | ||
| if err == nil { | ||
| return &jsonResponse{ | ||
| status: http.StatusPreconditionFailed, | ||
| errorMessage: "Precondition failed", | ||
| } | ||
| } | ||
| } else if err != nil { | ||
| } else if _, err := s.backend.GetObjectWithGeneration(bucketName, objectName, gen); err != nil { |
There was a problem hiding this comment.
The diff looks much larger because I had to build the capability to use the filesystem backend in tests, but this is the meat of it.
|
I'm late to the party :) I see it's already merged. Do you still need my input? You can also try to run the script I attached to the issue, it reproduces the bug. |
Yes, looks like we're good! |
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.
This change is a follow-up to #735: previously, ifGenerationMatch=0 was
special-cased and the server used GetObject, which works on filesystem
and memory backends. That pull request changed the code to use
GetObjectWithGeneration, which is not supported by the filesystem
backend.
We couldn't catch this in tests because the test suite only runs with
the memory backend, so as part of this change I'm also including the
ability to use the filesystem storage in the test suite. That can get
slow though.
This is a hack and should be revisited once we implement #744.