Skip to content

Make GoogleCloudStorageRetryingInputStream request same generation on resume #127626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6238090
Specify generation on resume
nicktindall May 2, 2025
e94b246
Add test for contents changed on resume
nicktindall May 2, 2025
bcab09b
Update docs/changelog/127626.yaml
nicktindall May 2, 2025
98a80c3
Assert we get a generation header
nicktindall May 2, 2025
08e1b95
Delete docs/changelog/127626.yaml
nicktindall May 2, 2025
09c6e6e
Add random path when present, don't assert generation header is present
nicktindall May 2, 2025
576109c
Update test/fixtures/gcs-fixture/src/main/java/fixture/gcs/MockGcsBlo…
nicktindall May 4, 2025
4feb87d
Update test/fixtures/gcs-fixture/src/main/java/fixture/gcs/MockGcsBlo…
nicktindall May 4, 2025
0886ba7
Reduce indenting
nicktindall May 4, 2025
cdfffa5
Assert that x-goog-generation is present
nicktindall May 4, 2025
d3c0e6a
Assert that x-goog-generation is present
nicktindall May 5, 2025
f3371e4
Log a warning if we see a missing or malformed generation header
nicktindall May 5, 2025
89b926a
Merge branch 'main' into ES-11432_check_generation_on_resume
nicktindall May 17, 2025
fca2161
Add x-goog-generation header to test
nicktindall May 18, 2025
2d2960c
Randomise x-goog-generation
nicktindall May 20, 2025
ce03dae
Tidy, improve naming
nicktindall May 20, 2025
eebcb0c
Test in third-party test
nicktindall May 21, 2025
4fd9b81
Merge branch 'main' into ES-11432_check_generation_on_resume
nicktindall May 21, 2025
a8826fb
Clean proxied repo after test
nicktindall May 21, 2025
aeea9f6
Try SO_REUSEADDR to allow restarting proxy
nicktindall May 21, 2025
03a9b8d
Make httpServer field volatile for thread-safe restarts
nicktindall May 22, 2025
289a594
Merge branch 'main' into ES-11432_check_generation_on_resume
nicktindall May 22, 2025
a60d7e0
Include repoName in base_path
nicktindall May 22, 2025
b0f9298
Add logging in proxy
nicktindall May 22, 2025
caaf45c
Don't use proxy to test resume
nicktindall May 22, 2025
b800710
Merge remote-tracking branch 'origin/main' into ES-11432_check_genera…
nicktindall May 22, 2025
0f8796b
Don't use proxy to test resume
nicktindall May 22, 2025
16d6c39
Merge remote-tracking branch 'origin/ES-11432_check_generation_on_res…
nicktindall May 22, 2025
a70e2ad
Don't use proxy to test resume
nicktindall May 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update test/fixtures/gcs-fixture/src/main/java/fixture/gcs/MockGcsBlo…
…bStore.java

Co-authored-by: Jeremy Dahlgren <[email protected]>
  • Loading branch information
nicktindall and JeremyDahlgren authored May 4, 2025
commit 4feb87d242fd3cc8a5c0a3f15ef11c38f783cdd6
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ BlobVersion getBlob(String path, Long ifGenerationMatch, Long generation) {
if (generation != null && generation != blob.generation) {
throw new BlobNotFoundException(blob.path, blob.generation);
}
if (ifGenerationMatch != null && blob.generation != ifGenerationMatch) {
if (ifGenerationMatch != null && ifGenerationMatch != blob.generation) {
throw new GcsRestException(
RestStatus.PRECONDITION_FAILED,
"Generation mismatch, expected " + ifGenerationMatch + " but got " + blob.generation
Expand Down