Switch branches/tags
Commits on May 19, 2011
  1. Merge branch 'riak_kv-0.14' of into riak_kv-…

    Kelly McLaughlin committed May 19, 2011
  2. Resolve last-write determinstically, fixing bz://1095.

    jtuple committed with jonmeredith May 17, 2011
    When two contents have the same timestamp, resolve as follows:
    1. If one is marked as deleted, chose the non-deleted content.
    2. Otherwise, resolve by opaque comparison of content data.
  3. Add Reply parameter to handle_not_found_reply so that the notfound er…

    Kelly McLaughlin committed Apr 22, 2011
    are present if requested by the client.
    tags: az327
    The fix to address bz1006 causes notfound error information to be excluded
    from the results of a MapReduce even if the inclusion is requested by
    the client. This changes corrects that by adding a Reply parameter to
    the handle_not_found_reply function and ensuring that after the
    final preference list entry has been checked that Reply is appended
    to the phase state's pending value.
    Add test cases for riak_kv_mapreduce:map_object_value to show that
    the include_notfound and filter_notfound actions work as expected.
  4. Improve error handling and process interaction in the MapReduce code …

    Kelly McLaughlin committed May 3, 2011
    …to prevent
    the termination of all active MapReduce jobs if a single MapReduce job times
    out or terminates unexpectedly.
    Fixes: AZ340
    Handle the case of an error tuple being returned from the calls to
    riak_kv_mapper_sup:new_mapper in riak_kv_map_master so that a timeout
    does not cause riak_kv_map_master to terminate and take all active
    MapReduce jobs with it.
    Change riak_kv_map_master so that it does not monitor mapper processes
    and instead trap exits and rely on the link to the mapper proesses
    to detect when the mapper process terminates.
  5. Refactor try/catch in riak_kv_map_phase:handle_not_found_reply to be

    Kelly McLaughlin committed Apr 13, 2011
    more readable.
  6. Minimize the amount of code in a try/catch block in riak_kv_map_phase…

    Kelly McLaughlin committed Apr 13, 2011
    and only catch the specific case of an exit with reason exhausted_preflist.
  7. Remove case-clause checks in riak_kv_map_master:handle_not_found_repl…

    Kelly McLaughlin committed Apr 13, 2011
    …y whose chance of ever executing was at or very close to zero.
  8. Add some comments and minor updates to error handling case-clauses

    Kelly McLaughlin committed Apr 13, 2011
    in riak_kv_map_phase:handle_not_found_reply.
  9. Handle the not found error tuples generated by erlang and js

    Kelly McLaughlin committed Apr 12, 2011
    map functions.
  10. Change riak_kv_map_phase so that the other preflist entries are checked

    Kelly McLaughlin committed Apr 6, 2011
    before giving up when an object is not found on the vnode initially
    selected for a map phase.
Commits on May 11, 2011
  1. Merge branch 'riak_kv-0.14' of into riak_kv-…

    Jared Morrow committed May 11, 2011
  2. Update bitcask dependency to 1.1.6

    Jared Morrow committed May 11, 2011
  3. Merge pull request #93 from basho/bz1094-rr-timestamp-0.14

    jonmeredith committed May 11, 2011
    Bz1094 rr timestamp 0.14
Commits on May 2, 2011
Commits on Apr 28, 2011
  1. Bumped erlang_js dependency to tag erlang_js-0.6.1

    Jared Morrow committed Apr 28, 2011
Commits on Apr 22, 2011
  1. Use riak_core-0.14.2

    dizzyd committed Apr 22, 2011
Commits on Apr 13, 2011
  1. Bumping to 0.14.2

    dizzyd committed Apr 13, 2011
  2. Change handle_info clause in riak_kv_keys_fsm to check for any reason

    Kelly McLaughlin committed Apr 12, 2011
    for an 'EXIT' message instead of just using the generic badmsg catchall.
  3. Handle error messages sent from the keys fsm promptly instead of

    Kelly McLaughlin committed Apr 12, 2011
    only relying on the client timeout value.
  4. Handle failure from calls to riak_kv_keylister_master:start_keylist,

    Kelly McLaughlin committed Apr 12, 2011
    pass the client-supplied timeout through to riak_kv_keylister_master,
    and handle the case where there are no nodes available to process
    a key list operation.
  5. Catch timeout errors when starting a new key lister and allow the use

    Kelly McLaughlin committed Apr 12, 2011
    of a client-supplied timeout value.
Commits on Apr 12, 2011
  1. Unique list of siblings while merging.

    jonmeredith committed with dizzyd Apr 7, 2011
    Prior to the fix for bz://977 when performing syntactic put merge
    each of the vndoes used a local timestamp for the vclock increment.
    If the vnodes were not updating inside the same second the siblings
    would be duplicated.   This will repair any objects with duplicated
    Thanks to Kresten for suggestions.
  2. Make vnode put use the timestamp in the request for vclock increment.

    Jon Meredith committed with dizzyd Mar 17, 2011
    Fixes bz://977 value duplication issue.
Commits on Apr 8, 2011
  1. pick up erlang_js shutdown fix in 0.6.0

    Bryan Fink committed Apr 8, 2011
  2. pick up BZ 1015 fix in luke 0.2.4

    Bryan Fink committed Apr 8, 2011
  3. copy start_js fix from dc994e4

    Bryan Fink committed Apr 8, 2011
    porting from master to riak_kv-0.14
Commits on Mar 31, 2011
  1. link mapper to phase pid and JS VM

    Bryan Fink committed Mar 31, 2011
    Linking to the phase pid ensures that this mapper gets torn down
    immediately when the phase dies, instead of hanging around finishing its
    current evaluation and batch.
    Linking to the JS VM is the easiest way to "return" the VM to the pool.
    It doesn't actually return the VM, but instead kills it and allows the
    VM supervisor to spin up a fresh one.
Commits on Feb 23, 2011
  1. Use riak_core-0.14.1 tag

    dizzyd committed Feb 23, 2011
Commits on Feb 7, 2011
  1. Use riak-1.1.0 dependency

    dizzyd committed Feb 7, 2011
  2. Bumping to 0.14.1

    dizzyd committed Feb 7, 2011