Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop 2.0 merge. #658

Merged
merged 14 commits into from
Feb 24, 2015
Merged

Develop 2.0 merge. #658

merged 14 commits into from
Feb 24, 2015

Commits on Aug 19, 2014

  1. Fixes to make edoc happy

    macintux committed Aug 19, 2014
    Configuration menu
    Copy the full SHA
    9d575dd View commit details
    Browse the repository at this point in the history
  2. More superficial cleanup: consistency, typos, fix module comments tha…

    …t were unintentionally attributed to the first function
    macintux committed Aug 19, 2014
    2 Configuration menu
    Copy the full SHA
    7d0a3d2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b91c852 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2014

  1. Moar monospace

    macintux committed Aug 21, 2014
    Configuration menu
    Copy the full SHA
    a76490b View commit details
    Browse the repository at this point in the history
  2. Remember how to monospace

    macintux committed Aug 21, 2014
    6 Configuration menu
    Copy the full SHA
    63924a9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #610 from basho/jrd/feature/edoc-fixes

    Various fixes for edoc
    
    Reviewed-by: reiddraper
    borshop committed Aug 21, 2014
    Configuration menu
    Copy the full SHA
    bfe96ed View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2014

  1. Configuration menu
    Copy the full SHA
    79f97f0 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2014

  1. Implement soft_exit, primarily for aae_fullsyn.

    Problem: transient failures of aae, such as trees not yet built or locks not
    being aquired, would cause an aae fullsync process to exit abnormally. This
    could happen several times in a row, creating log spam.
    
    Resolution: the concept of soft_exit. A soft_exit is a message sent from a soon
    to be exiting process to a soft_linked process. The exiting process would then
    exit normally, while any soft_linked processes could handle the soft_exit
    message in a similar fashion as an exit message. This would indicate an exit
    reason that should be handled, but not bad enough to have the system logger
    know about it.
    
    The soft_exit message sent from the aae worker to the fscoordinator is
    as simple as `{soft_exit, pid(), term()}'.
    
    The current implementation is not generic. There can only one soft_link to
    the aae, and there's no general mechanism to use soft_link's or soft_exits
    elsewhere in the code base. Sorry.
    
    Another change rolled into this is consistent use of a #partition_info record
    in the fscoordinator, and error tracking the fscoordinator's state. By swapping
    to useing a single data structure in the partition queue, whereis waiting list,
    and purgatory queues it makes it easier to understand the fscordinator (as
    there is less code modify structures).
    
    This is a forward port of the fix done for 1.4. Conflicts favor existing code
    where it does not directly effect the fix.
    
    Conflicts:
    	Makefile
    	rebar.config
    	src/riak_repl2_fssource.erl
    	src/riak_repl2_rtq_proxy.erl
    	src/riak_repl_aae_source.erl
    	test/riak_core_cluster_mgr_tests.erl
    lordnull committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    24fa16f View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2014

  1. Fixed invalid call to update error count track.

    Increment_error_dict expects the partition, elementN of error dict, and the
    state. It pulls the dict out of the state so it put it back in place, thus just
    returning the state. So this call that passed the dict in was wrong.
    lordnull authored and engelsanchez committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    cbd3741 View commit details
    Browse the repository at this point in the history
  2. Fix error/retry exit counts on location down msgs

    When a partition is not available, perhaps after a number of retries,
    the error exits stat should be incremented. Also, the retry exits stat
    should be incremented on each retry.  This was discovered when
    backporting the repl_location_failures riak_test.
    engelsanchez committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    aea4b42 View commit details
    Browse the repository at this point in the history
  3. Fix dialyzer warnings

    The one in riak_repl2_fssource is a legit bug in the code
    engelsanchez committed Dec 5, 2014
    6 Configuration menu
    Copy the full SHA
    c9beaa4 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2014

  1. Merge pull request #636 from basho/feature/mw/forward-port-chatty-tra…

    …nsient-aae-fs-failures
    
    Implement soft_exit, primarily for aae_fullsyn.
    
    Reviewed-by: engelsanchez
    borshop committed Dec 6, 2014
    Configuration menu
    Copy the full SHA
    236f241 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Merge branch '2.0' into develop

    Conflicts:
    	dialyzer.ignore-warnings
    	rebar.config
    engelsanchez committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    c0e6735 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Merge branch '2.0' into develop-2.0-merge

    Conflicts:
    	src/riak_repl2_fscoordinator.erl
    cmeiklejohn committed Feb 12, 2015
    5 Configuration menu
    Copy the full SHA
    8c6b159 View commit details
    Browse the repository at this point in the history