Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 053db07ba788
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5c5f7a22fe06
Choose a head ref
  • 9 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 18, 2020

  1. Copy the full SHA
    f795df2 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    777d1c0 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    25d6656 View commit details
    Browse the repository at this point in the history
  4. consul.passthru.tests: Fix failure on current consul. Fixes #90613.

    Done by setting `autopilot.min_quorum = 3`.
    
    Techncially, this would have been required to keep the test correct since
    Consul's "autopilot" "Dead Server Cleanup" was enabled by default (I believe
    that was in Consul 0.8). Practically, the issue only occurred with our NixOS
    test with releases >= `1.7.0-beta2` (see #90613). The setting itself is
    available since Consul 1.6.2.
    
    However, this setting was not documented clearly enough for anybody to notice,
    and only the upstream issue hashicorp/consul#8118
    I filed brought that to light.
    
    As explained there, the test could also have been made pass by applying the
    more correct rolling reboot procedure
    
        -m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]")
        +m.wait_until_succeeds(
        +    "[ $(consul operator raft list-peers | grep true | wc -l) == 3 ]"
        +)
    
    but we also intend to test that Consul can regain consensus even if
    the quorum gets temporarily broken.
    nh2 committed Jun 18, 2020
    Copy the full SHA
    a59a972 View commit details
    Browse the repository at this point in the history
  5. consul.passthru.tests: Refactor into functions.

    For better naming and commentary.
    nh2 committed Jun 18, 2020
    Copy the full SHA
    701c0eb View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    811bcbe View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    bcdac2e View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    b3b27ed View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. Merge pull request #90701 from nh2/issue-90613-fix-consul-reboot-test

    consul.passthru.tests: Fix failure on current consul versions, add more tests
    nh2 committed Jun 26, 2020
    Copy the full SHA
    5c5f7a2 View commit details
    Browse the repository at this point in the history