Merge branch riak/2.0 into master w/ some updates to yz_extractors along the way
#866
Conversation
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
There is a race in riak_snmp_stat_poller, which occurs when realtime replication is enabled for more than two clusters. If the replication is enabled quickly enough, then the bug does not manifest itself. This change introduces a sleep between enabling replication between the individual clusters, thus causing the test to fail consistently instead of sporadically.
Update verify_snmp_repl test to prove that cluster stats are correctly recorded in SNMP.
zeeshanlakhani
force-pushed
the
bugfix/forward-merge-snmp-stat-poller-race
branch
from
a097273 to
35cb49f
Compare
Specifically, introduce the `gen_keys/1` and `assert_search/6` functions into yokozuna_rt module and refactor tests to use them instead of copied and pasted code fragments. (cherry picked from commit 49d5c36)
zeeshanlakhani
changed the title
riak/2.0 into masterriak/2.0 into master w/ some updates to yz_extractors along the way
zeeshanlakhani
force-pushed
the
bugfix/forward-merge-snmp-stat-poller-race
branch
from
844ee9c to
0768ebc
Compare
|
👍 0768ebc |
jvoegele
added a commit
that referenced
this pull request
Oct 15, 2015
…ler-race Merge branch `riak/2.0` into `master` w/ some updates to yz_extractors along the way
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.
Part of this merge is a forward-merge for #863 into riak_test
master. The relevant changes are insrc/yokozuna_rt.erlandtests/verify_snmp_repl.erl. The remaining changes are yokozuna tests that have not yet been forward-merged intomasterand were taken along for the ride.Zeeshan's notes 10/9, per commit: 844ee9c
After some env work, I no longer ran into the issue I was having w/ the race from basho/riak_kv#872 (another issue for another time).
I've updated yokozuna_rt and the extractors test here to actually test the issue in basho/yokozuna#547, as I finally gathered what was going on.
Please review @jvoegele @fadushin and run the extractors test off 2.1, and rec using basho/yokozuna#572 branch off of 2.1.