Permalink
Switch branches/tags
Commits on Mar 17, 2017
  1. Merge pull request #900 from basho/fix-riak_core_util-compose

    jvoegele committed Mar 17, 2017
    Fix riak_core_util:compose functions
Commits on Mar 15, 2017
  1. Merge commit 'b8a11b4ef132d26d8f342b4d3553396c4577a2eb' into develop

    fadushin committed Mar 15, 2017
    # Conflicts:
    #	rebar.config
Commits on Mar 10, 2017
  1. Merge pull request #907 from basho/nem-remove-more-legacy-search

    nickelization committed Mar 10, 2017
    Remove legacy search, continued
  2. Removing vestiges of riak_search (#906)

    fadushin committed with thumbot Mar 10, 2017
    * Removing vestiges of riak_search
Commits on Mar 8, 2017
  1. Merge develop-2.2 into develop (#905)

    bsparrow435 committed Mar 8, 2017
    * Merge develop-2.2 into develop
    
    Pick up fixes:
    
    Deterministic resolution when colliding on 1-second granularity
    Extra debug logging for ring transitions
    Add back legacy reconcile code because it’s an API change
    
    * Add legacy_reconcile export
Commits on Mar 7, 2017
Commits on Mar 3, 2017
  1. Bump exometer_core

    bsparrow435 committed Mar 3, 2017
Commits on Mar 2, 2017
  1. Merge pull request #901 from basho/bjs/merge-2.0-to-2.2

    bsparrow435 committed Mar 2, 2017
    Bring 2.0 bug fixes to 2.2
Commits on Feb 24, 2017
  1. Fix riak_core_util:compose functions

    jvoegele committed Feb 24, 2017
    Fix the `compose/1` and `compose/2` functions in `riak_core_util`:
    * Compose lists of functions from right-to-left to match mathematical
      definition.
    * Add type variables to the type specs to express the intent that all
      functions being composed together should have the same type signature
      (a single argument of type `X`, returning a value of type `X`).
    * Add a test case that exposed the bug in the previous implementation
      that composed from left-to-right.
Commits on Feb 22, 2017
Commits on Feb 21, 2017
  1. Add riak_core_security:find_unique_user_by_metadata (#885)

    ian-mi committed with thumbot Feb 21, 2017
    * Add riak_core_security:find_unique_user_by_metadata
    
    This functions identically to find_one_user_by_metadata but returns
    {error, not_unique} if there are multiple users with matching
    metadata.
    * Merge branch 'develop' into find-unique-user-by-metadata
Commits on Feb 15, 2017
  1. Add riak_core_security:find_user (#892)

    ian-mi committed with thumbot Feb 15, 2017
    * Add riak_core_security:find_user
Commits on Jan 26, 2017
  1. Merge pull request #897 from basho/nem-update-behaviors-to-use-callba…

    nickelization committed Jan 26, 2017
    …ck-specs
    
    Update behavior specs to use -callback directives
Commits on Jan 20, 2017
  1. Remove dialyzer.ignore-warnings file (#896)

    nickelization committed with thumbot Jan 20, 2017
    * Remove dialyzer.ignore-warnings file
    
    Turns out none of the warnings in this file actually exist anymore.
    
    More generally, I can't remember the last time I've written code that
    generated a warning that wasn't fixable. Rather than emptying out
    dialyzer.ignore-warnings, I'm just going to blow it away altogether to
    discourage people from relying on it in the future. We can always add it
    back if we really need it.
Commits on Jan 12, 2017
  1. Merge pull request #886 from basho/bjs-riak-2772-2.0.8

    ian-mi committed Jan 12, 2017
    add nodenames to the merge_meta comparison
  2. Merge pull request #887 from basho/bjs-overload-sync-command-hang

    JeetKunDoug committed Jan 12, 2017
    Fix potential hang due to vnode proxy overload bug [JIRA: RIAK-3124]
  3. Merge pull request #893 from basho/bjs/enhancement/log_ring_reconcile

    JeetKunDoug committed Jan 12, 2017
    Fix RIAK-2643 by adding debug logging for meta and ring
  4. Merge pull request #894 from basho/bjs/bugfix/fix_dropped_vnode_requests

    JeetKunDoug committed Jan 12, 2017
    Fix RIAK-2169 by fixing stat name `dropped_vnode_requests`
Commits on Jan 11, 2017
  1. Fix RIAK-2169, error with counter 'dropped_vnode_requests' -- was inc…

    sargun committed with bsparrow435 Sep 17, 2015
    …orrectly named dropped_vnode_requests_total, which is the stats projection
  2. Fix RIAK-2643 by adding debug logging for meta and ring

    bsparrow435 committed Jan 11, 2017
    There have been a few issues where rapidly updating the ring results in
    sub optimal behavior. These have been difficult to debug due to the
    lack of logging in the `riak_core_ring` module. We’ve added debug
    logging which can be enabled as needed to log ring metadata
    merges(buckets, real, etc) and ring membership and resulting rings from
    a reconciliation. For 2.2.1, we should add a new lager sink just for
    logging ring operations.
Commits on Jan 9, 2017
  1. Merge pull request #781 from basho/fix-dropped-vnode-requests-RIAK-2169

    bsparrow435 committed Jan 9, 2017
    Fix RIAK-2169, error with counter 'dropped_vnode_requests' -- was inc [JIRA: RIAK-2203]
Commits on Jan 6, 2017
  1. Merge pull request #889 from basho/find-bucket-grants

    ian-mi committed Jan 6, 2017
    Find bucket grants
  2. Test group grants in test_find_bucket_grants

    ian-mi committed Dec 17, 2016
    Test both a normal group as well as the 'all' group.
  3. Handle 'all' atom in bin2name

    ian-mi committed Dec 17, 2016
  4. Add riak_core_security:find_bucket_grants

    ian-mi committed Dec 14, 2016
    Returns all grants affecting the specified bucket.
Commits on Dec 29, 2016
  1. Add thumbs (#879)

    davidx committed with thumbot Dec 29, 2016
    * add thumbs
    * Hopefully resolve test process stop issues.
    
    - Add a call to `meck:unload/0` in setup for all tests that use meck
      in order to make sure meck processes are unloaded _before_ starting
      up new ones. It appears eunit doesn't always call a teardown function
      before moving on to another test, so they can't be depended upon.
    - unlink before stopping `riak_core_ring_manager` and `riak_core_ring_events`
      in `core_vnode_eqc` - this seems to be what was actually causing the
      "unexpected exit" of a test process.
    - add `stop_pid/2` in riak_core_test_util so you can pass an exit type
      which was being used by a test and failing
    - unlink processes that are `start_link`ed to tests
    - Fix sync command typo to stop riak_core_ring_events
    * Add some additional fixes to stopping processes started with `start_link`.
    - Stop proesses start_linked
    - Add a `spawn` wrapper around a test to see if it helps with isolating tests (it did).
    * `meck:unload()` before starting `core_vnode_eqc` test.
    
    Ends up, the `meck` calls in `riak_core_util` were breaking
    `core_vnode_eqc`, which doesn't even _use_ `meck`. Call `meck:unload()`
    at end of test in `riak_core_util` (not in test teardown, which can also
    cause problems), and again at the beginning of `core_vnode_eqc` just in
    case some new test later on tries to break it again.
    * Move `riak_core_capability` tests to their own file.
    
    Because of `meck` issues we need to keep unit tests and modules
    separate for modules that are mecked in other tests.
    * Address review comments on test fixes.
    
    - add `set_broadcast_module/2` to riak_core_node_watcher, wrapped in
      an `-ifdef(TEST)` so we can potentially change the implementation
      later without having to change the test, which used to do a direct
      `gen_server:call` to the `set_bcast_mod` `handle_call` function.
    - Change `riak_core_ring_manager:stop/0` from a cast to a call. As a
      cast, it leaves us vulnerable to potential race conditions in test
      startup/shutdown. Because it was only a test function anyway, making
      the caller wait for the stop seems reasonable. Also wrapped it in
      `-ifdef(TEST)` to make sure it's not called from production code.
    - Add `unlink_named_process` to `riak_core_test_util` and use it
      where we had `unlink(whereis(name_of_process))`
    - remove last copy/paste of `stop_pid` function from `bg_manager_eqc`
      and `core_vnode_eqc` and use `riak_core_test_util` functions instead.
    - Fix copyright notice in bucket_eqc_utils.
    - Found that we needed to call `meck:unload` after each test in
      `bprops_eqc` and `btypes_eqc` to avoid a meck/coverdata issue.
      Moved setup and unload of `meck`s in `bucket_eqc_utils` to the
      `per_test_setup` function and dropped `setup_cleanup/0` as it was no
      longer doing anything.
    * Update `bprops_eqc` and `btypes_eqc` to use `eqc:testing_time` instead
    of `eqc:numtests` as it's possible for it to time out via `eunit` if
    you allow them to do 100 iterations.
Commits on Dec 15, 2016
  1. Merge pull request #884 from basho/nem-fix-overload-sync-command-hang

    nickelization committed Dec 15, 2016
    Fix sync_spawn_command hang triggered by bug in vnode proxy overload handling