-
Notifications
You must be signed in to change notification settings - Fork 95
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.
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
Enable proxy get in multibag environment #1167
Conversation
Change of rebar is addition of '+A 0' option to escript_emu_args. rebar.config to build rebar: {escript_emu_args, "%%! -escript +A 0\n"}. Some numbers to execute rebar eunit and rebar generate: https://gist.github.com/shino/46816bf50ec609104861
see also: Use brancket expression for digit class by shino · Pull Request #10 · basho/tools.mk basho/tools.mk#10
Build is still failing due to deps mismatch. Once the PR for riak_cs_multibag is merged, deps should be updated. |
Anyway, this is ready for review. |
{mapping, "proxy_get", "riak_cs.proxy_get", [ | ||
{default, off}, | ||
{datatype, flag}, | ||
hidden |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this would be better if this is not hidden, as a guidance for repl user.
Unittest failed: {'EXIT',
{undef,
[{riak_cs_lfs_utils,new_manifest,
[<<"bucket">>,"test_file",
<<"c2dfd963-49ff-40ce-ba4f-a6e6f3e73c70">>,10485760,<<"ctype">>,
"md5",
{dict,0,16,16,8,80,48,
{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},
{{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}},
1048576,
{acl_v2,
{"tester","tester_id","tester_key_id"},
[{{"tester","tester_id"},['FULL_CONTROL']}],
{1434,702097,286801}}],
[]},
{riak_cs_delete_deadlock,'-prop_delete_deadlock/0-fun-0-',1,
[{file,"test/riak_cs_delete_deadlock.erl"},{line,75}]}]}}
After 1 tests.
{<<"c2dfd963-49ff-40ce-ba4f-a6e6f3e73c70">>,
[{part_manifest_v1,<<"part_bucket">>,<<"part_key">>,
{1434,702097,286340},
495,<<"60d51418-b758-4d14-a1ab-190d072c0c7d">>,10485760,
undefined,1024}]}
Shrinking.(1 times)
Reason:
{'EXIT',
{undef,
[{riak_cs_lfs_utils,new_manifest,
[<<"bucket">>,"test_file",
<<"c2dfd963-49ff-40ce-ba4f-a6e6f3e73c70">>,10485760,<<"ctype">>,
"md5",
{dict,0,16,16,8,80,48,
{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},
{{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}},
1048576,
{acl_v2,
{"tester","tester_id","tester_key_id"},
[{{"tester","tester_id"},['FULL_CONTROL']}],
{1434,702097,294544}}],
[]},
{riak_cs_delete_deadlock,'-prop_delete_deadlock/0-fun-0-',1,
[{file,"test/riak_cs_delete_deadlock.erl"},{line,75}]},
{eqc_lazy_lists,lazy_map,2,
[{file,"../src/eqc_lazy_lists.erl"},{line,35}]}]}}
{<<"c2dfd963-49ff-40ce-ba4f-a6e6f3e73c70">>,
[{part_manifest_v1,<<"part_bucket">>,<<"part_key">>,
{1434,702097,286340},
1,<<"60d51418-b758-4d14-a1ab-190d072c0c7d">>,10485760,
undefined,1024}]}
riak_cs_delete_deadlock:52: eqc_test_...*failed*
in function riak_cs_delete_deadlock:'-eqc_test_/0-fun-3-'/1 (test/riak_cs_delete_deadlock.erl, line 52)
**error:{assertEqual_failed,[{module,riak_cs_delete_deadlock},
{line,52},
{expression,"quickcheck ( numtests ( ? TEST_ITERATIONS , ? QC_OUT ( ( prop_delete_deadlock ( ) ) ) ) )"},
{expected,true},
{value,false}]} |
On purpose to get attention for MDC users
Addressed comments and pushed. |
You also have to fix |
@@ -488,6 +462,7 @@ local_get_block_timeout() -> | |||
?TIMEOUT_CONFIG_FUNC(get_index_range_gckeys_timeout). | |||
?TIMEOUT_CONFIG_FUNC(get_index_range_gckeys_call_timeout). | |||
?TIMEOUT_CONFIG_FUNC(get_index_list_multipart_uploads_timeout). | |||
?TIMEOUT_CONFIG_FUNC(cluster_id_timeout). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From the implicit naming convention on these timeouts, this would better be get_clusterid_timeout
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The configuration item is not introduced by this PR. [1] Changing the name will bring in backward incompatibility.
[1] at tag 2.0: https://github.com/basho/riak_cs/blob/2.0/src/riak_cs_config.erl#L256
First round maybe finished; basic approach to resolve the target cluster for proxy_get in block_server look nice. But I feel we don't have to include whole manifest in all block servers. Just a bag id is enough I think. |
Anyway, good work. |
Looks like riak_test is also failing ...
I don't understand why this happens... because put_fsm line 408 says ClusterID = riak_cs_mb_helper:cluster_id(BagId), Will dig in more. Note: I was using wrong commit. |
Rebased and open new PR #1171. |
Related PR: basho/riak_cs_multibag#25
This PR includes two logically unrelated commits with proxy_get functionality