Skip to content

Temporarily vendor fork of etcd#2158

Merged
aaronlehmann merged 1 commit intomoby:masterfrom
aaronlehmann:vendor-etcd-fork
May 2, 2017
Merged

Temporarily vendor fork of etcd#2158
aaronlehmann merged 1 commit intomoby:masterfrom
aaronlehmann:vendor-etcd-fork

Conversation

@aaronlehmann
Copy link
Copy Markdown
Collaborator

Now that we are using CheckQuorum, it is causing some spurious leader
elections that are leading to test failures in both SwarmKit and Docker
integration tests.

I submitted this change upstream, but it hasn't been reviewed yet. I'd
like to temporarily vendor a fork that has the change. First, this will
unblock vendoring swarmkit from the master branch. Also, it will give us
a chance to test the change more broadly. Finally, we probably don't
want to vendor the master branch of etcd, so without this temporary
fork, we'd have to wait for a release that includes this change.

@codecov
Copy link
Copy Markdown

codecov bot commented May 1, 2017

Codecov Report

Merging #2158 into master will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #2158      +/-   ##
=========================================
+ Coverage   59.88%   59.9%   +0.01%     
=========================================
  Files         119     119              
  Lines       19664   19664              
=========================================
+ Hits        11776   11779       +3     
+ Misses       6550    6545       -5     
- Partials     1338    1340       +2

vendor.conf Outdated

# etcd/raft
github.com/coreos/etcd 824277cb3a577a0e8c829ca9ec557b973fe06d20
github.com/coreos/etcd ea5389a79f40206170582c1ea076191b8622cb8e https://github.com/aaronlehmann/etcd
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: does it make sense to link to the specific etcd PR here, so that it's clear why this fork was needed?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a link

Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Now that we are using CheckQuorum, it is causing some spurious leader
elections that are leading to test failures in both SwarmKit and Docker
integration tests.

I submitted this change upstream, but it hasn't been reviewed yet. I'd
like to temporarily vendor a fork that has the change. First, this will
unblock vendoring swarmkit from the master branch. Also, it will give us
a chance to test the change more broadly. Finally, we probably don't
want to vendor the master branch of etcd, so without this temporary
fork, we'd have to wait for a release that includes this change.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@dongluochen
Copy link
Copy Markdown
Contributor

LGTM

@aaronlehmann aaronlehmann merged commit 8f053c2 into moby:master May 2, 2017
@aaronlehmann aaronlehmann deleted the vendor-etcd-fork branch May 2, 2017 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants