Commits on Sep 4, 2013
  1. @engelsanchez

    Merge 1.4.2 into develop

    Conflicts:
    	rebar.config
    engelsanchez committed Sep 4, 2013
Commits on Aug 24, 2013
  1. @jtuple
  2. @jtuple
Commits on Aug 23, 2013
  1. @jtuple
  2. @jaredmorrow
  3. @jaredmorrow
Commits on Aug 20, 2013
  1. @engelsanchez

    Merge pull request #356 from basho/eas-folsom-stat-error-protection

    Add protection against folsom stat errors
    engelsanchez committed Aug 19, 2013
Commits on Aug 19, 2013
  1. @evanmcc

    Merge pull request #359 from basho/pevm-drop-bad-data

    Corruption filtering changes for core.
    evanmcc committed Aug 19, 2013
  2. @engelsanchez

    Add protection against folsom stat errors

    Folsom may sometimes return an error tuple if something goes wrong (see
    folsom_ets.erl), but our code was only catching exceptions. So the error
    would end up being used as a valid value and crash the riak_kv_stat
    process later. This fixes that problem and gives us better protection
    from folsom funkiness.
    engelsanchez committed Aug 14, 2013
Commits on Aug 17, 2013
  1. @evanmcc
Commits on Aug 13, 2013
  1. @jaredmorrow

    Merge branch '1.4'

    jaredmorrow committed Aug 13, 2013
Commits on Aug 1, 2013
  1. @rzezeski

    Roll version 1.4.1

    rzezeski committed Aug 1, 2013
Commits on Jul 31, 2013
  1. @russelldb

    Merge pull request #351 from basho/gh350-vnodeq-stats

    Fix catch pattern to match all errors
    russelldb committed Jul 31, 2013
Commits on Jul 30, 2013
  1. @jonmeredith

    Merge pull request #352 from basho/jdm-tcp-mon-add-dist-fix

    Fix TCP mon to correctly spot nodes coming up.
    jonmeredith committed Jul 30, 2013
  2. @jonmeredith

    Fix TCP mon to correctly spot nodes coming up.

    Corrected add_dist_conn argument order on nodeup event.
    jonmeredith committed Jul 30, 2013
Commits on Jul 29, 2013
  1. @russelldb
Commits on Jul 18, 2013
  1. @evanmcc

    Merge pull request #348 from basho/pevm-r16-compat

    R16B01 compatibility changes.
    evanmcc committed Jul 18, 2013
  2. @evanmcc

    bump webmachine tag

    evanmcc committed Jul 18, 2013
  3. @Vagabond
Commits on Jul 15, 2013
  1. @evanmcc
Commits on Jul 12, 2013
  1. @cmeiklejohn

    Merge pull request #285 from basho/csm-remove-unnecessary-fn

    Remove unnecessary function call.
    cmeiklejohn committed Jul 11, 2013
  2. @cmeiklejohn
Commits on Jul 11, 2013
  1. @evanmcc
  2. @jaredmorrow

    Merge branch '1.4'

    jaredmorrow committed Jul 11, 2013
Commits on Jul 9, 2013
  1. @jtuple
  2. @jtuple

    Fix two major vnode manager bugs

    First, fix a bug that enabled a race condition wherein the vnode
    manager could start the same vnode multiple times. This would result
    in both vnode instances trying to acquire the same backend, which
    would fail and force the Riak node to shutdown.
    
    The cause of this bug was a change introduced during the large
    ring optimization work for Riak 1.4. In this work, an unbounded
    `ets:match_delete` that resulted in a table scan was changed to
    a straightforward `ets:delete`. Unfortunately, the `ets:delete`
    could delete data associated with a newer instance of a given vnode
    in cases where a monitor for a prior instance fired after the new
    instance was created.  This bug was fixed by switching to a bounded
    `ets:match_delete` that avoids the table scan while also avoiding
    unintended deletes.
    
    Second, fix a bug introduced during the parallel vnode initialization
    work from Riak 1.3.1 that caused the vnode manager to newly monitor a
    given vnode each time get_vnode_pid was called. This bug could result
    in an unbounded number of monitors being created in certain scenarios,
    causing a node to become slower over time until it was restarted.
    jtuple committed Jul 8, 2013
  3. @evanmcc

    update hash functions

    evanmcc committed Jul 8, 2013
Commits on Jul 2, 2013
  1. @jaredmorrow

    Merge branch '1.4'

    jaredmorrow committed Jul 2, 2013
Commits on Jul 1, 2013
  1. @jrwest

    Merge pull request #345 from basho/jrw-incrvsn-resize-replace

    Incrememnt Ring Version when Force-Replacing during Resize
    jrwest committed Jul 1, 2013
Commits on Jun 28, 2013
  1. @jrwest

    Incrememnt Ring Version when Force-Replacing during Resize

    Because the claimant runs in a different "mode" the ring version may
    not be incremented otherwise causing reconcilation during gossip to
    fail. Seen in the wild and recreated periodically during riak_test
    jrwest committed Jun 28, 2013
Commits on Jun 26, 2013
  1. @jaredmorrow
Commits on Jun 24, 2013
  1. @jrwest

    Merge pull request #331 from basho/jrw-resize-foh-fix

    fix forced_ownership_handoff during resize
    jrwest committed Jun 24, 2013
Commits on Jun 21, 2013
  1. @russelldb

    Merge pull request #336 from basho/gh335-reshed-stats

    Fix crashing stat mod never getting rescheduled
    russelldb committed Jun 21, 2013
Commits on Jun 19, 2013
  1. only silently drop DOWN-normal messages in deleted modstate

    This is a restriction of the modification made in PR #334.
    
    Dropping all {'DOWN',_,process,_,normal} messages on the floor instead
    of passing them to vnode handle_info functions causes riak_pipe vnodes
    to missing messages that it uses to cleanup workers for pipes that
    shutdown unexpectedly.
    
    This commit restricts the DOWN-normal message dropping to the case
    that the vnode's modstate is {deleted, _}. PR #334 suggests the original
    modification was made only to quiet the log spam generated by the
    following clause, which also only operates in modstate-deleted.
    
    Before this commit, the riak_test pipe_verify_exceptions would fail
    during its verify_middle_fitting_normal test, because workers would be
    left running after the fitting exited 'normal'. After this commit,
    workers are once again terminated correctly, so the test passes again.
    Bryan Fink committed Jun 19, 2013