Merge 1.4.2 to develop #368
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
Folsom may sometimes return an error tuple if something goes wrong (see folsom_ets.erl), but our code was only catching exceptions. So the error would end up being used as a valid value and crash the riak_kv_stat process later. This fixes that problem and gives us better protection from folsom funkiness.
Corruption filtering changes for core.
Add protection against folsom stat errors
Conflicts: rebar.config
|
👍 code looks good, eunit passes except for some known brokenness |
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.
Testing status: most tests should pass, but occasionally I'm seeing the vnode proxy overload and stat cache tests fail, unfortunately.