Fix repair handoff crash, missing not sent fun #339

Merged
merged 2 commits into from Jun 17, 2013

Conversation

Projects
None yet
2 participants
Contributor

engelsanchez commented Jun 15, 2013

/cc @jrwest @javajolt
Partition repair was crashing on an undefined 'not sent function' in the handoff accumulator record. Jordan should know the details of the recent change that introduced him. Jordan: please review, feel free to replace with cleaner version of the fix.

Without this fix, the partition_repair riak_test fails every time. It passes with the fix.

@jrwest jrwest commented on an outdated diff Jun 15, 2013

src/riak_core_handoff_sender.erl
@@ -334,9 +334,13 @@ visit_item(K, V, Acc) ->
end;
false ->
+ NewNotSentAcc = case NotSentFun of
@jrwest

jrwest Jun 15, 2013

Contributor

think it would be nice to pull this out into a separate function

Contributor

jrwest commented Jun 15, 2013

@engelsanchez code changes make sense. Left one style comment but I can address that while testing this change if you are busy. Will run the riak_test's later this evening when I get home.

Contributor

jrwest commented Jun 16, 2013

@engelsanchez trying to run the test but getting the error below. Pretty sure its a riak_test config thing but I have spam_dir set in default section of config to existing directory and was getting different error until i untarrred the search-corpus tar. Any ideas?

20:20:14.029 [warning] partition_repair failed: {undef,[{rt,config_or_os_env,[spam_dir],[]},{partition_repair,confirm,0,[{file,"tests/partition_repair.erl"},{line,32}]}]}
20:20:14.030 [error] Error in process <0.94.0> on node 'riak_test@127.0.0.1' with exit value: {undef,[{rt,config_or_os_env,[spam_dir],[]},{partition_repair,confirm,0,[{file,"tests/partition_repair.erl"},{line,32}]}]}

EDIT: not that i think it affects things but this happens w/ or w/o this branch

engelsanchez referenced this pull request in basho/riak_test Jun 17, 2013

Merged

Fix aftermath of rt_config refactor #309

Contributor

jrwest commented Jun 17, 2013

pushed a small cleanup commit for the comment I left (re: refactoring). partition_repair, with recent riak_test fixes, passes with this change and fails w/o. Thanks for finding & fixing this @engelsanchez. +1.

@engelsanchez engelsanchez added a commit that referenced this pull request Jun 17, 2013

@engelsanchez engelsanchez Merge pull request #339 from basho/eas-fix-partition-repair-not-sent-fun
Fix repair handoff crash, missing not sent fun
500be1d

@engelsanchez engelsanchez merged commit 500be1d into master Jun 17, 2013

1 check passed

default The Travis CI build passed
Details

engelsanchez deleted the eas-fix-partition-repair-not-sent-fun branch Jun 17, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment