valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 08:35:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve race with plan/commit.

Browse Source 
When the plan phase fails, because of a race between adding
nodes to the cluster, don't attempt to commit or it will fail.
This commit is contained in:
Christopher Meiklejohn 2014-07-28 15:27:42 -04:00
parent cb235be64d
commit 3818690d31
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rt.erl
View File

@ -406,9 +406,9 @@ plan_and_commit(Node) ->
{error, ring_not_ready} -> {error, ring_not_ready} ->
lager:info("plan: ring not ready"), lager:info("plan: ring not ready"),
timer:sleep(100), timer:sleep(100),
maybe_wait_for_changes(Node),
plan_and_commit(Node); plan_and_commit(Node);
{ok, _, _} -> {ok, _, _} ->
lager:info("plan: done"),
do_commit(Node) do_commit(Node)
end. end.
@ -435,6 +435,8 @@ maybe_wait_for_changes(Node) ->
Ring = get_ring(Node), Ring = get_ring(Node),
Changes = riak_core_ring:pending_changes(Ring), Changes = riak_core_ring:pending_changes(Ring),
Joining = riak_core_ring:members(Ring, [joining]), Joining = riak_core_ring:members(Ring, [joining]),
lager:info("maybe_wait_for_changes, changes: ~p joining: ~p",
[Changes, Joining]),
if Changes =:= [] -> if Changes =:= [] ->
ok; ok;
Joining =/= [] -> Joining =/= [] ->