Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

resolve inconsistencies detected during ring merge #3637

Merged
merged 7 commits into from
Jun 14, 2019
Merged

resolve inconsistencies detected during ring merge #3637

merged 7 commits into from
Jun 14, 2019

Commits on May 3, 2019

  1. resolve inconsistencies detected during ring merge 

    Fixes #1962
    @murali-reddy
    murali-reddy committed May 3, 2019
    Configuration menu
    Copy the full SHA
    a400d43 View commit details
    Browse the repository at this point in the history

  2. fix lint

    @murali-reddy
    murali-reddy committed May 3, 2019
    Configuration menu
    Copy the full SHA
    11c55a3 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. during merge we receive update to an entry that ring owns, and has a … 

    …newer version, set our version to the one received plus one, effectively imposing our existing entry
    @murali-reddy
    murali-reddy committed May 9, 2019
    Configuration menu
    Copy the full SHA
    89db743 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. move code to reset the entry free space from entries.merge() to Ring.… 

    …Merge()
    @murali-reddy
    murali-reddy committed May 10, 2019
    Configuration menu
    Copy the full SHA
    51d7f45 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. add ring debug log during merge()

    @murali-reddy
    murali-reddy committed May 13, 2019
    Configuration menu
    Copy the full SHA
    2d91226 View commit details
    Browse the repository at this point in the history

  2. check for allocations in the range that got transffered when its split

    @murali-reddy
    murali-reddy committed May 13, 2019
    Configuration menu
    Copy the full SHA
    5e69e8a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2019

  1. use space to check if entry in a range has allocations while doing ri… 

    …ng merge
    @murali-reddy
    murali-reddy committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    90ccc4a View commit details
    Browse the repository at this point in the history