resources: Don't run multiple cleanups for one storage path #7664
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
If a resource blob had already been deleted from storage when the cleanup ran, it would fail (logging an error) and leave the cleanup record around. This would prevent migrations, since the source precheck ensures there aren't any cleanups. If the blob's already gone, the cleanup should succeed. Fixes https://bugs.launchpad.net/juju/+bug/1705352
This was the cause of the failed cleanups for resources that were blocking migrations. Unit and applications resources were both found and cleanups were scheduled for them even if they had the same storage-path. This meant that the first cleanup would succeed and the second would fail. Change ResourcePersistence.NewRemoveResourcesOps to only emit one cleanup for each path.
babbageclunk
changed the title
axw
approved these changes
Jul 21, 2017
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
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.
Description of change
Destroying an application with units would result in multiple cleanups being scheduled for the same storage path, because there are resource records for the application and the units. Change
ResourcePersistence.NewRemoveResourcesOpsto only schedule a cleanup once for a given path.If a resource blob had already been deleted from storage when the cleanup ran, it would fail (logging an error) and leave the cleanup record around. This would prevent migrations, since the source precheck
ensures there aren't any cleanups. If the blob's already gone, the cleanup should succeed.
QA steps
Bug reference
Fixes https://bugs.launchpad.net/juju/+bug/1705352