Rollback persisted configuration on blob store add/modify failures#1440
Merged
groldan merged 1 commit intoGeoWebCache:mainfrom Oct 14, 2025
Merged
Conversation
jodygarnett
approved these changes
Oct 14, 2025
Contributor
jodygarnett
left a comment
jodygarnett
left a comment
There was a problem hiding this comment.
Minor feedback, but it looks okay
geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationTest.java
Show resolved
Hide resolved
geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationTest.java
Show resolved
Hide resolved
geowebcache/core/src/main/java/org/geowebcache/config/XMLConfiguration.java
Show resolved
Hide resolved
groldan
force-pushed
the
xmlconfig_revert_blobstore_on_failure_to_save
branch
from
06edaf2 to
5383600
Compare
When adding or modifying a blob store, if an exception occurs after the configuration has been persisted to disk, the stored XML file could be left in an invalid state that prevents application startup on restart. This prevents GeoServer to store invalid blob store configurations, for as long as the BlobStore throws UnsuitableStorageException, in order not to change the current logic. This fix ensures that if save() or handleAddBlobStore()/handleModifyBlobStore() fail, the persisted configuration is rolled back by re-saving the previous valid state. Makes loadConfiguration() package-private with @VisibleForTesting to allow tests to verify the persisted state matches expectations after rollback.
groldan
force-pushed
the
xmlconfig_revert_blobstore_on_failure_to_save
branch
from
5383600 to
5159d74
Compare
10 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When adding or modifying a blob store, if an exception occurs after the configuration has been persisted to disk, the stored XML file could be left in an invalid state that prevents application startup on restart.
This prevents GeoServer to store invalid blob store configurations, for as long as the BlobStore throws UnsuitableStorageException, in order not to change the current logic.
This fix ensures that if save() or handleAddBlobStore()/handleModifyBlobStore() fail, the persisted configuration is rolled back by re-saving the previous valid state. Makes loadConfiguration() package-private with @VisibleForTesting to allow tests to verify the persisted state matches expectations after rollback.