Skip to content
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

Align FileBlobStore with parameter handling practice of S3/Azure #1230

Merged
merged 2 commits into from
Apr 15, 2024

Conversation

aaime
Copy link
Member

@aaime aaime commented Apr 8, 2024

Should address #880

@aaime aaime force-pushed the files_paramameters_ids branch 3 times, most recently from 3928f71 to 3e75270 Compare April 9, 2024 10:47
@aaime aaime requested a review from smithkm April 9, 2024 13:07
@aaime
Copy link
Member Author

aaime commented Apr 10, 2024

@smithkm updated so that it also removes the old entries from the previous storage (the layer metadata file).
Was easier than I thought, since purgeOrphans ends up calling deleteByParametersId, I just needed to remove the mappings in there.

Copy link
Member

@groldan groldan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aaime aaime merged commit 360f6a1 into GeoWebCache:main Apr 15, 2024
7 checks passed
@aaime
Copy link
Member Author

aaime commented Apr 15, 2024

Merged. Wondering about a backport. Anyone wants to try this out for a bit?

@aaime
Copy link
Member Author

aaime commented May 8, 2024

@groldan @smithkm how do you feel about a backport of these changes to stable?
#1230

On one side, it's new, on the other one, the previous approach was not working under load/with many filter parameters.

@aaime
Copy link
Member Author

aaime commented May 10, 2024

The backport to 1.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 48ea5259... Fix javadoc formatting broken by previous commit
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
[backport-1230-to-1.25.x 7961ddce] Align FileBlobStore with parameter handling practice of S3/Azure
 Author: Andrea Aime <[email protected]>
 Date: Mon Apr 8 19:42:31 2024 +0200
 2 files changed, 130 insertions(+), 41 deletions(-)
Auto-merging geowebcache/core/src/main/java/org/geowebcache/locks/MemoryLockProvider.java
CONFLICT (content): Merge conflict in geowebcache/core/src/main/java/org/geowebcache/locks/MemoryLockProvider.java

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.25.x 1.25.x
# Navigate to the new working tree
cd .worktrees/backport-1.25.x
# Create a new branch
git switch --create backport-1230-to-1.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c545cf215fb6c080b3b935fb3b5c710223ff4f84,48ea5259e495533d9b7e9b3e93d0fa3d7e4b969d
# Push it to GitHub
git push --set-upstream origin backport-1230-to-1.25.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.25.x

Then, create a pull request where the base branch is 1.25.x and the compare/head branch is backport-1230-to-1.25.x.

@aaime
Copy link
Member Author

aaime commented May 10, 2024

The backport to 1.24.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 48ea5259... Fix javadoc formatting broken by previous commit
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
[backport-1230-to-1.24.x f3522275] Align FileBlobStore with parameter handling practice of S3/Azure
 Author: Andrea Aime <[email protected]>
 Date: Mon Apr 8 19:42:31 2024 +0200
 2 files changed, 130 insertions(+), 41 deletions(-)
Auto-merging geowebcache/core/src/main/java/org/geowebcache/locks/MemoryLockProvider.java
CONFLICT (content): Merge conflict in geowebcache/core/src/main/java/org/geowebcache/locks/MemoryLockProvider.java

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.24.x 1.24.x
# Navigate to the new working tree
cd .worktrees/backport-1.24.x
# Create a new branch
git switch --create backport-1230-to-1.24.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c545cf215fb6c080b3b935fb3b5c710223ff4f84,48ea5259e495533d9b7e9b3e93d0fa3d7e4b969d
# Push it to GitHub
git push --set-upstream origin backport-1230-to-1.24.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.24.x

Then, create a pull request where the base branch is 1.24.x and the compare/head branch is backport-1230-to-1.24.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants