Skip to content

Merge riak_test 2.0 onto 2.1 #926

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

Merged
merged 5 commits into from
Nov 10, 2015
Merged

Merge riak_test 2.0 onto 2.1 #926

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81d74cd
yokozuna_rt additions for types and better testing w/ allow-mult=true…
zeeshanlakhani Oct 9, 2015
6f0e534
Merge pull request #886 from basho/backport/zl/yz_extractors+rt-fixum…
fadushin Oct 27, 2015
a255cc1
Add debugging to rt:do_commit/1 to track nothing_planned
Nov 10, 2015
1b34707
Merge pull request #925 from basho/bugfix/bch/add-cluster-commit-logging
Nov 10, 2015
78096fa
Merge branch 'riak/2.0' into merge/bch/2.0to2.1-cluster-commit-debug
Nov 10, 2015
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
6 changes: 4 additions & 2 deletions src/rt.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ staged_join(Node, PNode) ->

plan_and_commit(Node) ->
timer:sleep(500),
lager:info("planning and commiting cluster join"),
lager:info("planning cluster join"),
case rpc:call(Node, riak_core_claimant, plan, []) of
{error, ring_not_ready} ->
lager:info("plan: ring not ready"),
Expand All @@ -461,6 +461,7 @@ plan_and_commit(Node) ->
end.

do_commit(Node) ->
lager:info("planning cluster commit"),
case rpc:call(Node, riak_core_claimant, commit, []) of
{error, plan_changed} ->
lager:info("commit: plan changed"),
Expand All @@ -472,8 +473,9 @@ do_commit(Node) ->
timer:sleep(100),
maybe_wait_for_changes(Node),
do_commit(Node);
{error,nothing_planned} ->
{error, nothing_planned} ->
%% Assume plan actually committed somehow
lager:info("commit: nothing planned"),
ok;
ok ->
ok
Expand Down