Skip to content
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

Update dependent modules #1047

Merged
merged 7 commits into from
Jan 19, 2015
Merged

Update dependent modules #1047

merged 7 commits into from
Jan 19, 2015

Conversation

kuenishi
Copy link
Contributor

  • Update node_package, getopt, folsom, cluster_info to the latest
  • Update riak-erlang-client and riak_repl_pb_api to 2.0.1/2.0.0
  • lager 2.1.0 conflicts with lager_syslog 2.0.3 => not using
  • riak_cs_multibag will be pinned with rebar_lock_deps_plugin
  • Webmachine will be updated to upcoming 1.10.7
  • update webmachine (https://github.com/basho/webmachine/pull/233) for Ku range fix mochiweb#17

- Update node_package, getopt, folsom, cluster_info to the latest
- Update riak-erlang-client and riak_repl_pb_api to 2.0.1/2.0.0
- erlcloud and webmachine requires conflict resolution on ibrowse
- lager 2.1.0 conflicts with lager_syslog 2.0.3
- riak_cs_multibag will be pinned with rebar_lock_deps_plugin
@kuenishi
Copy link
Contributor Author

Fmm. Still having errors like

==> riak_cs (dialyzer)
riak_cs_block_server.erl:318: The pattern Success = {'ok', _} can never match the type {'error',_}
riak_cs_block_server.erl:353: The pattern {'ok', RiakObject} can never match the type {'error',_}
riak_cs_config.erl:239: The pattern {'ok', ClusterID} can never match the type {'error',_}
tools.mk:38: recipe for target 'dialyzer-run' failed
make: *** [dialyzer-run] Error 1

Looks like hard part of riak_pb is related.

@kuenishi kuenishi added this to the 2.0.0 milestone Jan 15, 2015
@shino
Copy link
Contributor

shino commented Jan 15, 2015

riak_cs_multibag will be pinned with rebar_lock_deps_plugin

IIRC, the plugin uses hardcoded locked config file. This repository uses an environment variable to build two flavors (oss and enterprise). I'm wondering how these work well together 💭

@shino
Copy link
Contributor

shino commented Jan 15, 2015

Just for a memo: one issue I know now about webmachine/mochiweb upgrading.
There is a little discrepancy how to treat range header in corner case bytes=0-,
which can be treated as partial contents as well as normal non-range contents.

The changes in webmachine and forked mochiweb were [1] and [2].

[1] basho/mochiweb#7
[2] https://github.com/basho/webmachine/pull/124

@kuenishi
Copy link
Contributor Author

I decided to ignore those three errors because they all come from riak_pb types and don't want to dive deep there. As Shino mentioned, object_get_test and external_client_tests are now failing.

@kuenishi
Copy link
Contributor Author

basho/webmachine#124 is included in the latest webmachine develop (which is to be tagged as 1.10.7). basho/mochiweb#7 is waiting for merge as basho/mochiweb#17 .

@kuenishi kuenishi force-pushed the feature/update-dependencies branch from ed110eb to e0bdb9f Compare January 16, 2015 05:34
@shino
Copy link
Contributor

shino commented Jan 16, 2015

upgrade_downgrade_test fails with multibag configuration.

================ upgrade_downgrade_test failure stack trace =====================
{{aws_error,{http_error,404,[],
                        <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?><Error><Code>NoSuchKey</Code><Message>The specified key does not exist.</Message><Resource>/riak-test-bucket-foobar/riak_test_key1</Resource><RequestId></RequestId></Error>">>}},
 [{erlcloud_s3,s3_request,9,[{file,"src/erlcloud_s3.erl"},{line,898}]},
  {erlcloud_s3,fetch_object,5,[{file,"src/erlcloud_s3.erl"},{line,456}]},
  {upgrade_downgrade_test,basic_get_test_case,4,
                          [{file,"riak_test/tests/upgrade_downgrade_test.erl"},
                           {line,147}]},
  {upgrade_downgrade_test,verify_all_data,2,
                          [{file,"riak_test/tests/upgrade_downgrade_test.erl"},
                           {line,135}]},
  {upgrade_downgrade_test,confirm,0,
                          [{file,"riak_test/tests/upgrade_downgrade_test.erl"},
                           {line,64}]},
  {riak_test_runner,return_to_exit,3,
                    [{file,"src/riak_test_runner.erl"},{line,159}]}]}
=================================================================================

@kuenishi
Copy link
Contributor Author

I think we should merge basho/riak_cs_multibag#16 first.

@kuenishi
Copy link
Contributor Author

@shino fmmm. It worked for me with the latest multibag.

@kuenishi
Copy link
Contributor Author

And https://github.com/basho/webmachine/pull/233 followed by 1.10.7 tag will be the last dependent work.

@kuenishi
Copy link
Contributor Author

Will run r_t on Monday. riak_cs_multibag will be tagged just before packaging/performance testing/release.

@kuenishi
Copy link
Contributor Author

@shino I reproduced! My rt configuration was bad; previous CS was not the EE one.

@kuenishi
Copy link
Contributor Author

Fixed

@@ -270,6 +271,9 @@ do_get_block(ReplyPid, Bucket, Key, ClusterID, UseProxyGet, ProxyActive,
Timeout, ProceedFun, RetryFun, NumRetries, UseProxyGet,
ProxyActive, ClusterID).

-spec try_local_get(riak_client(), binary(), binary(), list(), list(),
timeout(), fun(), fun(), non_neg_integer(), boolean(),
boolean(), binary()) -> no_return().
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The doc[1] says no_return() = none() is bottom type. But this function can return ok or any term that ProceedFun returns. It should be any() or term().

[1] http://www.erlang.org/doc/reference_manual/typespec.html

@kuenishi kuenishi force-pushed the feature/update-dependencies branch from 59bb3a7 to d5faf3d Compare January 19, 2015 06:39
@kuenishi
Copy link
Contributor Author

Fixed the spec and force-pushed 😈

borshop added a commit that referenced this pull request Jan 19, 2015
Update dependent modules

Reviewed-by: shino
@kuenishi
Copy link
Contributor Author

@borshop merge

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

Successfully merging this pull request may close these issues.

4 participants