Permalink
Switch branches/tags
Commits on Sep 23, 2015
  1. Merge pull request #781 from basho/fix-dropped-vnode-requests-RIAK-2169

    borshop committed Sep 23, 2015
    Fix RIAK-2169, error with counter 'dropped_vnode_requests' -- was inc [JIRA: RIAK-2203]
    
    Reviewed-by: javajolt
Commits on Sep 17, 2015
  1. Fix RIAK-2169, error with counter 'dropped_vnode_requests' -- was inc…

    sargun committed Sep 17, 2015
    …orrectly named dropped_vnode_requests_total, which is the stats projection
Commits on Sep 16, 2015
  1. Merge pull request #745 from ahf/fix-undefined-tuple-type

    lehoff committed Sep 16, 2015
    Use unsized, typeless, tuple to fix OTP 18 compilation
Commits on Jul 28, 2015
  1. Merge pull request #756 from basho/dtr/forward_merge_2.1

    borshop committed Jul 28, 2015
    Forward merge 2.1 into develop, with some changes
    
    Reviewed-by: nickelization
Commits on Jul 27, 2015
  1. Forward merging 2.1 back to develop. Removing mode of legacy gossip a…

    JeetKunDoug committed Jul 27, 2015
    …gain as we don't need all of it for 2.NEXT (and only reverted the PR in 2.1 for backward-compatibility of a few riak_core APIs). Retained riak_core_ring:upgrade/downgrade to maintain compatibility with riak_repl.
Commits on Jul 23, 2015
  1. Merge pull request #754 from basho/nem-clique-0.3.2-version-bump

    borshop committed Jul 23, 2015
    Bump clique to version 0.3.2
    
    Reviewed-by: mrallen1
Commits on Jul 10, 2015
  1. Bump clique to version 0.3.2

    nickelization committed Jul 10, 2015
    The new version of clique includes several bugfixes over 0.3.1
Commits on Jul 9, 2015
  1. Merge pull request #751 from basho/dtr/revert_legacy_gossip_removal

    borshop committed Jul 9, 2015
    Revert removal of legacy gossip as it is a breaking API change.
    
    Reviewed-by: jonmeredith
  2. Revert removal of legacy gossip as it is a breaking API change.

    JeetKunDoug committed Jul 9, 2015
    - Found when trying to update MDC to riak_core/2.1
Commits on Jul 7, 2015
  1. Merge pull request #750 from basho/dtr/forward_merge_2.0

    borshop committed Jul 7, 2015
    Forward merge 2.0 to 2.1
    
    Reviewed-by: zeeshanlakhani
Commits on Jul 2, 2015
  1. Merge branch '2.0' into forward_merge_2.0

    JeetKunDoug committed Jul 2, 2015
    Conflicts:
    	rebar.config
Commits on Jun 25, 2015
  1. Bumped exometer_core to pick up meck 0.8.2

    buildbot
    buildbot committed Jun 25, 2015
Commits on Jun 24, 2015
  1. Merge pull request #748 from basho/nem-clique-0.3.1-version-bump

    borshop committed Jun 24, 2015
    Update riak_core to use clique 0.3.1
    
    Reviewed-by: cuyler
  2. Update riak_core to use clique 0.3.1

    nickelization committed Jun 24, 2015
    We don't currently need to use the new features of clique 0.3.1, but it
    won't hurt to update, and we need the latest clique version for the data
    platform so this will help prevent version conflicts.
Commits on Jun 23, 2015
  1. Merge pull request #747 from basho/nem-clique-0.3.0

    borshop committed Jun 23, 2015
    Update riak_core to use clique 0.3.0
    
    Reviewed-by: paegun
  2. Update riak_core to use clique 0.3.0

    nickelization committed Jun 23, 2015
    Clique 0.3.0 introduces an extra argument that's passed to the command
    callbacks. The existing code in riak_core that uses clique doesn't need
    this extra argument, so we can just ignore it, but we still need to add
    an extra _ argument at the beginning of each command callback.
Commits on Jun 20, 2015
  1. Merge pull request #732 from basho/bugfix/2.0-sysmon-long-schedule-po…

    cmeiklejohn committed Jun 20, 2015
    …rt-handler
    
    Teach the sysmon handler about long schedules on ports.
Commits on Jun 15, 2015
  1. Use unsized, typeless, tuple to fix OTP 18 compilation

    ahf committed Jun 15, 2015
    This patch fixes compilation for OTP 18. There's currently no method of
    specifying a tuple of arbitrary size of type T.
Commits on Jun 6, 2015
  1. Merge pull request #742 from orivej/update-readme

    borshop committed Jun 6, 2015
    Update link to "Where To Start With Riak Core"
    
    Reviewed-by: cmeiklejohn
Commits on Jun 3, 2015
  1. Merge pull request #741 from basho/bugfix/csm/revert-tainted-ring-bug

    borshop committed Jun 3, 2015
    Revert typo.
    
    Reviewed-by: jonmeredith
  2. Revert typo.

    cmeiklejohn committed Jun 3, 2015
    Revert a typo introduced by 727fa77, where the wrong ring is selected and returned.  This results certain test configurations dumping hundreds of tainted ring errors into the log.
    
    2015-06-03 14:02:04.865 [error] <0.135.0>@riak_core_ring:check_tainted:209 Error: riak_core_ring/ring_ready called on tainted ring

    2015-06-03 14:02:04.865 [info] <0.135.0>@riak_core_gossip:log_node_added:354 'dev2@127.0.0.1' joined cluster with status 'joining'

    2015-06-03 14:02:04.865 [error] <0.135.0>@riak_core_ring:check_tainted:209 Error: Persisting tainted ring
Commits on May 29, 2015
  1. Merge pull request #728 from basho/bugfix/jrd/edoc

    borshop committed May 29, 2015
    Minor fixes to allow make docs to succeed
    
    Reviewed-by: cmeiklejohn
Commits on May 27, 2015
  1. Merge pull request #737 from basho/bugfix/sdc/remove-legacy-gossip-re…

    borshop committed May 27, 2015
    …based
    
    "Remove legacy gossip" rebased onto current develop
    
    Reviewed-by: cmeiklejohn
Commits on May 26, 2015
  1. This is 1205ea4 ("Remove legacy gossip.") rebased onto develop

    hmmr committed May 17, 2015
    The riak_core_gossip:legacy_gossip/0 and related functions have been
    stubbed to false in commit d0ea731 ("Permanently disable
    legacy gossip"), by Joseph Blomstedt way back in 2013-05-20.  It was
    merged in at some point before tag 1.4.0.
    
    Sean Cribbs' commit (the one currently being rebased) dates from
    2014-04-01.  It exists in branch bugfix/sdc/remove-legacy-gossip, and
    has not been merged.  There is a PR for that, #541.
    
    In this commit, Sean removes the code paths that would have been not
    dead if legacy_gossip ever returned 'true', as well as the checks
    proper.
Commits on Apr 30, 2015
  1. Teach the sysmon handler about long schedules on ports.

    jonmeredith committed Apr 30, 2015
    Found this in a customer log
    ```
    2015-04-28 18:55:43.735 [info]
    <0.233.0>@riak_core_sysmon_handler:handle_event:92 monitor long_schedule
    [{erlang,process_info,[#Port<0.1461>,[registered_name,initial_call,current_function,message_queue_len]],[]},{riak_core_sysmon_handler,get_pretty_proc_info,2,[{file,[115,114,99,47,114,105,97,107,95,99,111,114,101,95,115,121,115,109,111,110,95,104,97,110,100,108,101,114,46,101,114,108]},{line,193}]},{riak_core_sysmon_handler,format_pretty_proc_info,2,[{file,[115,114,99,47,114,105,97,107,95,99,111,114,101,95,115,121,115,109,111,110,95,104,97,110,100,108,101,114,46,101,114,108]},{line,176}]},{riak_core_sysmon_handler,handle_event,2,[{file,[115,114,99,47,114,105,97,107,95,99,111,114,101,95,115,121,115,109,111,110,95,104,97,110,100,108,101,114,46,101,114,108]},{line,91}]},{gen_event,server_update,4,[{file,[103,101,110,95,101,118,101,110,116,46,101,114,108]},{line,522}]},{gen_event,server_notify,4,[{file,[103,101,110,95,101,118,101,110,116,46,101,114,108]},{line,504}]},{gen_event,handle_msg,5,[{file,[103,101,110,95,101,118,101,110,116,46,101,114,108]},{line,266}]},{proc_lib,wake_up,3,[{file,[112,114,111,99,95,108,105,98,46,101,114,108]},{line,249}]}]
    ```
    
    Should now look something more like this (reporting timeout was turned
    down to 1ms to provoke under a modest workload).
    
    ```
    2015-04-30 08:58:58.471 [info]
    <0.103.0>@riak_core_sysmon_handler:handle_event:92 monitor long_schedule
    [{links,[<0.29108.41>]},{id,41723},{connected,<0.29108.41>}
    ,{input,3285848198},{output,45},{os_pid,undefined},{queue_size,0}]
    [{timeout,2},{port_op,input}]
    ```
Commits on Apr 1, 2015
  1. Merge pull request #729 from basho/rebar/fd/riak_ensemble-dependency

    borshop committed Apr 1, 2015
    Set dependency on riak_ensemble to 2.1.0
    
    Reviewed-by: seancribbs
Commits on Mar 31, 2015
  1. Merge pull request #726 from basho/rebar/fd/eleveldb-dependency

    borshop committed Mar 31, 2015
    Corrected dependency on eleveldb tag
    
    Reviewed-by: andrewjstone
Commits on Mar 30, 2015
  1. Merge pull request #725 from basho/rebar/fd/eleveldb-dependency

    borshop committed Mar 30, 2015
    Set dependency on eleveldb 2.1.0.0 tag.
    
    Reviewed-by: kuenishi