5752 rescue parsedfile prefetch errors #1533
Merged
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
The parsedfile provider can handle multiple targets (multiple files, multiple crontabs, etc) but the provider does not handle the case when retrieving a target during prefetch fails. When the provider does only handle one target this doesn't really matter because a possible error is caught at a higher level (inside Puppet::Transaction). But if the provider handles multiple targets, one error will cause the whole prefetching method to fail and all targets are treated as empty. One example of the issue is described in #5752: Multiple crontabs are manages with crontab resources and one cronresource describes a cronentry of an absent user. Because prefetching the crontab of the absent user fails, the crontab of *all* users are purged and every crontab entry which is not managed by puppet is lost. The change now handles the error inside the parsedfile provider itself, so only the target that is causing troubles is treated as empty.
The current behavior of read errors in file types is to raise a generic error, which is difficult to rescue without rescuing everything. This commit adds a new exception subclass that can be explicitly rescued without rescuing every other error.
Without this commit the parsedfile provider will rescue any error generated from filetypes, regardless of if it's something that can be handled. This commit explicitly rescues errors generated when read errors occur so that errors that can't be handled are correctly propagated.
|
Looks good to me, 👍 |
adrienthebo
added a commit
that referenced
this pull request
Mar 18, 2013
…etch_errors 5752 rescue parsedfile prefetch errors
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 is a fixup of GH-1100.
If a read error occurs while the parsedfile provider is prefetching targets, it will propagate that error up to the transaction and will not prefetch any more records. This has the side effect of wiping out all unmanaged resources that haven't been prefetched. This set of commits explicitly handles read errors in the parsedfile provider to rescue read errors and try to prefetch as many targets as possible.