Merge 1.4 changes into develop, part 2 #413
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
…tart on timeout, and do not check the queue
Fix for heartbeat timeout bug discovered in riak_test repl_rt_heartbeat
The wrong check was causing the ack to be proxied through the helper. The helper builds a map for acks from v1 to the actual v2 sequence number. However, because this was a version 2 protocol, the map was not needed, and thus not built. Without finding the v1 sequence number, and ack is never sent to the rtq, leaving the object forever unacked.
Bugfix/mw rt incorrect ack 1.4
There is a possibiliy that the ackto value will equal completed due to skips. Without the fix, this means the ackto would never evaluate to a point where it can consume it. Now it can ack.
Upon futher inspection, ackedto could be somewhere in the middle of the completed list. This allows it to rewind that ack a bit to maintain consistency.
Fixes ack issues and queue fill up w/ bi-directional cascading
Conflicts: src/riak_repl2_rtsink_conn.erl
bookshelfdave
pushed a commit
that referenced
this pull request
Oct 3, 2013
Merge 1.4 changes into develop, part 2
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.
No description provided.