Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.04] Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff#492

Merged
andrewhsu merged 2 commits intodocker-archive:18.04from
andrewhsu:s
Apr 5, 2018
Merged

[18.04] Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff#492
andrewhsu merged 2 commits intodocker-archive:18.04from
andrewhsu:s

Conversation

@andrewhsu
Copy link
Copy Markdown
Contributor

brings in:

with cherry-pick of git commit moby/moby@2774965:

$ git cherry-pick -s -x -Xsubtree=components/engine 2774965

no conflicts

Changes included:

- Ingress network should not be attachable
- [manager/state] Add fernet as an option for raft encryption
- Log GRPC server errors
- Log leadership changes at manager level
- [state/raft] Increase raft ElectionTick to 10xHeartbeatTick
- Remove the containerd executor
- agent: backoff session when no remotes are available
- [ca/manager] Remove root CA key encryption support entirely
- Fix agent logging race (fixes moby/swarmkit#2576)
- Adding logic to restore networks in order

Also adds github.com/fernet/fernet-go as a new dependency

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 27749659d5a30999691e401a351221780a483099)
Signed-off-by: Andrew Hsu <[email protected]>
@andrewhsu andrewhsu added this to the 18.04.0 milestone Apr 4, 2018
@andrewhsu andrewhsu requested a review from thaJeztah April 4, 2018 20:31
@andrewhsu
Copy link
Copy Markdown
Contributor Author

andrewhsu commented Apr 4, 2018

seeing failure with git comit f08871a on ppc64le:

FAIL: docker_api_swarm_test.go:287: DockerSwarmSuite.TestAPISwarmLeaderElection

[d261e247856aa] waiting for daemon to start
[d261e247856aa] daemon started

[d5877abbbc8ed] waiting for daemon to start
[d5877abbbc8ed] daemon started

[d51d01decd678] waiting for daemon to start
[d51d01decd678] daemon started

[d261e247856aa] exiting daemon
docker_api_swarm_test.go:326:
    // wait for an election to occur
    waitAndAssert(c, defaultReconciliationTimeout, checkLeader(d2, d3), checker.True)
daemon/daemon_swarm.go:374:
    c.Assert(err, checker.IsNil)
... value *errors.errorString = &errors.errorString{s:"Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded"} ("Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded")

logs archived here

To accomodate for increase in leader election from 3 seconds to 10
seconds. This will give more cycles to find another leader.

Signed-off-by: Andrew Hsu <[email protected]>
(cherry picked from commit f040bf8e51cd76082729340342c7123cdc53d5b8)
Signed-off-by: Andrew Hsu <[email protected]>
@andrewhsu
Copy link
Copy Markdown
Contributor Author

andrewhsu commented Apr 5, 2018

Recording the windows test as flakey.
Recording the ppc64le test as flakey.
Recording the s390x test as flakey.

Copy link
Copy Markdown
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM

@tiborvass
Copy link
Copy Markdown
Contributor

LGTM

@andrewhsu andrewhsu merged commit 7af5eea into docker-archive:18.04 Apr 5, 2018
@andrewhsu andrewhsu deleted the s branch April 5, 2018 02:07
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 31, 2020
[18.04] Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
docker-jenkins pushed a commit that referenced this pull request Aug 10, 2020
[master] bump Golang 1.13.15
Upstream-commit: 5496ae0
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants