Skip to content

2.0 view change bugfix #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrewjstone wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

2.0 view change bugfix #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/riak_ensemble_peer.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ leading({update_members, Changes}, _From, State=#state{fact=Fact,
ViewSeq = {Fact#fact.epoch, Fact#fact.seq},
NewFact = Fact#fact{views=Views2, view_seq=ViewSeq},
pause_workers(State),
case try_commit(NewFact, State) of
case try_commit_new_view(NewFact, State) of
{ok, State3} ->
unpause_workers(State),
{reply, ok, leading, State3};
Expand Down Expand Up @@ -513,6 +513,20 @@ transition(State=#state{id=Id, fact=Fact}) ->
Failed
end.

-spec try_commit_new_view(fact(), state()) -> {failed, state()} | {ok, state()}.
try_commit_new_view(Fact, State) ->
Views = views(State),
NewFact = increment_sequence(Fact),
{Future, State2} = blocking_send_all({commit, NewFact}, State),
State3 = local_commit(NewFact, State2),
case wait_for_quorum(Future) of
{quorum_met, _Replies} ->
State4 = State3#state{last_views=Views},
{ok, State4};
{timeout, _Replies} ->
{failed, set_leader(undefined, State3)}
end.

-spec try_commit(fact(), state()) -> {failed, state()} | {ok, state()}.
try_commit(NewFact0, State) ->
Views = views(State),
Expand Down