Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Add messages for exporter tool & list timeouts #41

Merged
merged 3 commits into from

3 participants

@evanmcc
  • add asis for puts
  • add timeout for listkeys req
  • add real msg w/ stream and timeout for listbuckets req
@evanmcc evanmcc - add asis for puts
- add timeout for listkeys req
- add real msg w/ stream and timeout for listbuckets req
298eb77
@evanmcc evanmcc referenced this pull request in basho/riak_test
Merged

test for bucket and key listing timeouts #263

@evanmcc evanmcc was assigned
src/riak_kv.proto
@@ -106,16 +107,22 @@ message RpbDelReq {
// Delete response - not defined, will return a RpbDelResp on success or RpbErrorResp on failure
// List buckets request - no message defined, just send RpbListBucketsReq
+message RpbListBucketsReq {
+ optional uint32 timeout = 1;
@seancribbs Owner

I think we need a field here to indicate that we expect the response to stream, as this was not the case in previous API revisions.

@evanmcc
evanmcc added a note

I was following the pattern set by key listings, but you're right, for backwards compatibility we should have this and possibly modify the response. I'll take another look at pb_buckets code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
src/riak_kv.proto
@@ -106,16 +107,22 @@ message RpbDelReq {
// Delete response - not defined, will return a RpbDelResp on success or RpbErrorResp on failure
// List buckets request - no message defined, just send RpbListBucketsReq
@seancribbs Owner

Might want to change this, now that we have a message. :wink:

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

This seems like a riak_api problem, but since there is no pr for that repo, I'll comment here. I think I have all the proper branches of deps checked out, but getting a compile error trying to build riak_ee:

==> riak_api (compile)
/Users/kelly/basho/repos/riak_ee/deps/riak_api/src/riak_core_pb_bucket.erl:83: record rpbresetbucketreq undefined
/Users/kelly/basho/repos/riak_ee/deps/riak_api/src/riak_core_pb_bucket.erl:84: variable 'B' is unbound
ERROR: compile failed while processing /Users/kelly/basho/repos/riak_ee/deps/riak_api: rebar_abort
make: *** [compile] Error 1

Adding -include_lib("riak_pb/include/riak_search_pb.hrl"). to riak_core_pb_bucket.erl resolves the issue.

@kellymclaughlin
Collaborator

Opened issue for reset bucket props issue here

@kellymclaughlin
Collaborator

Bah, ok rebasing this branch to current master made the problems go away including the need for the include of riak_search_pb.hrl.

@kellymclaughlin
Collaborator

+1 to merge

@evanmcc evanmcc was assigned
@evanmcc evanmcc merged commit ce467c7 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 18, 2013
  1. @evanmcc

    - add asis for puts

    evanmcc authored
    - add timeout for listkeys req
    - add real msg w/ stream and timeout for listbuckets req
Commits on May 8, 2013
  1. @evanmcc
Commits on May 15, 2013
  1. @evanmcc
This page is out of date. Refresh to see the latest.
Showing with 9 additions and 2 deletions.
  1. +9 −2 src/riak_kv.proto
View
11 src/riak_kv.proto
@@ -106,17 +106,24 @@ message RpbDelReq {
// Delete response - not defined, will return a RpbDelResp on success or RpbErrorResp on failure
-// List buckets request - no message defined, just send RpbListBucketsReq
+// List buckets request
+message RpbListBucketsReq {
+ optional uint32 timeout = 1;
+ optional bool stream = 2;
+}
-// List buckets response
+// List buckets response - one or more of these packets will be sent
+// the last one will have done set true (and may not have any buckets in it)
message RpbListBucketsResp {
repeated bytes buckets = 1;
+ optional bool done = 2;
}
// List keys in bucket request
message RpbListKeysReq {
required bytes bucket = 1;
+ optional uint32 timeout = 2;
}
// List keys in bucket response - one or more of these packets will be sent
Something went wrong with that request. Please try again.