Handle 2i timeout #635

Merged
merged 3 commits into from Aug 21, 2013

Conversation

Projects
None yet
2 participants
Member

russelldb commented Aug 13, 2013

Fix 60sec hardcoded timeout on http stream.
Fix mochiweb crash error on http stream timeout firing

Tests are here basho/riak_test#350

Contributor

beerriot commented Aug 20, 2013

Fix 60sec hardcoded timeout on http stream.

It looks like there were two fixes made, and I just want to make sure they were both intended:

  • If a timeout query parameter is included, that value is used in the stream helper.
  • If no timeout query parameter is included, the value of DEFAULT_TIMEOUT in riak_index.erl is used. This means the default timeout is now infinity instead of 60000.
Member

russelldb commented Aug 20, 2013

Yes, both intended. Not entirely happy with the infinity timeout, but it is consistent with the non-stream default timeout (which itself is somewhat contentious.)

Contributor

beerriot commented Aug 20, 2013

Code makes sense. The change to verify_2i_timeout causes it to fail without this patch, and to pass with it. The verify_2i_stream, verify_2i_returnterms, verify_2i_limit, and secondary_index_tests tests all continue to pass with this patch in place.

The infinite default timeout has been discussed elsewhere (see #616), and is easily overridden in app.config.

+1. Merge away.

russelldb added a commit that referenced this pull request Aug 21, 2013

@russelldb russelldb merged commit 975e9fd into 1.4 Aug 21, 2013

1 check failed

default The Travis CI build failed
Details

@seancribbs seancribbs deleted the gh625-stream-timeout branch Apr 1, 2015

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