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

Adjust fold-objects timeout #811

Merged
merged 1 commit into from
Feb 20, 2014

Conversation

reiddraper
Copy link
Contributor

  • Revert part of 6e7027e. It is
    preferrable to use the request timeout over gen_server:call timoeuts.
    Further, these timeouts have been removed in the client in the master
    branch.
  • Make the fold objects request timeout configurable, using
    fold_objects_timeout.
  • Update riakc dependency to get features added in
  • Never use infinity request timeouts riak-erlang-client#160
  • Update riak_repl_pb_api (to get a consistent dependency on riak_pb)

* Revert part of 6e7027e. It is
  preferrable to use the request timeout over gen_server:call timoeuts.
  Further, these timeouts have been removed in the client in the master
  branch.
* Make the fold objects request timeout configurable, using
  `fold_objects_timeout`.
* Update riakc dependency to get features added in
* basho/riak-erlang-client#160
* Update riak_repl_pb_api (to get a consistent dependency on riak_pb)
@reiddraper reiddraper added this to the 1.4.5 milestone Feb 19, 2014
@shino
Copy link
Contributor

shino commented Feb 20, 2014

  • make test and make pulse pass
  • Dialyzer output clean (No new warnings)
  • xref
  • riak_test tests pass

@shino
Copy link
Contributor

shino commented Feb 20, 2014

manual test

AFTER

application:set_env(riak_cs, fold_objects_timeout, 100). and s3cmd ls.
Then FIN+ACK came from riak_cs after ~ 100 msec since GET request. Nice!

BEFORE

Setting timeout to 100 at current release/1.4 has NO effect (diff below),
s3cmd ls does recieve successful response.

diff --git a/src/riak_cs_list_objects_fsm_v2.erl b/src/riak_cs_list_objects_fsm_v2.erl
index 32e87a3..5f0ef06 100644
--- a/src/riak_cs_list_objects_fsm_v2.erl
+++ b/src/riak_cs_list_objects_fsm_v2.erl
@@ -358,7 +358,7 @@ make_2i_request(RiakcPid, State=#state{req=?LOREQ{name=BucketName},
             {end_key, EndKey},
-            {timeout, timer:minutes(1)},
+            {timeout, 100},
             {call_timeout, timer:minutes(1) + timer:seconds(10)}],

@shino
Copy link
Contributor

shino commented Feb 20, 2014

Code looks good.
👍 to merge! Nice work!!

reiddraper added a commit that referenced this pull request Feb 20, 2014
@reiddraper reiddraper merged commit 669c1f3 into release/1.4 Feb 20, 2014
@reiddraper reiddraper deleted the feature/revert-object-fold-call-timeout branch February 20, 2014 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants