Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Vendor swarmkit d60ccf3#31535

Merged
tonistiigi merged 1 commit intomoby:mastermoby/moby:masterfrom
aaronlehmann:vendor-swarmkit-7fc7503aaronlehmann/docker:vendor-swarmkit-7fc7503Copy head branch name to clipboard
Mar 8, 2017
Merged

Vendor swarmkit d60ccf3#31535
tonistiigi merged 1 commit intomoby:mastermoby/moby:masterfrom
aaronlehmann:vendor-swarmkit-7fc7503aaronlehmann/docker:vendor-swarmkit-7fc7503Copy head branch name to clipboard

Conversation

@aaronlehmann
Copy link
Copy Markdown

@aaronlehmann aaronlehmann commented Mar 4, 2017

This brings in the latest fixes from swarmkit, including the following:

There is one change to an integration test to prevent it from timing out. swarmkit is now more conservative about restarting the manager during a rapid demote/promote cycle. The test now waits for the node to become demoted before promoting it again, which avoids a slow timeout in swarmkit.

cc @cyli @dperny @tonistiigi

@aaronlehmann aaronlehmann mentioned this pull request Mar 4, 2017
Merged
7 tasks
@AkihiroSuda AkihiroSuda added rebuild/experimental status/failing-ci Indicates that the PR in its current state fails the test suite labels Mar 6, 2017
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Mar 6, 2017

probably CI failure is real

@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Mar 6, 2017

@AkihiroSuda: Thanks for pointing it out. There appears to be a panic:

panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x18 pc=0xff5269]

goroutine 185 [running]:
panic(0x1667360, 0xc420016050)
        /usr/local/go/src/runtime/panic.go:500 +0x1a1
github.com/docker/docker/vendor/github.com/docker/swarmkit/manager.defaultClusterObject(0xc4208c3d80, 0x19, 0xc4209e8cf0, 0x0, 0x0, 0x0, 0x2710, 0x0, 0x1f4, 0x300000001, ...)
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/manager.go:1053 +0x1f9
github.com/docker/docker/vendor/github.com/docker/swarmkit/manager.(*Manager).becomeLeader.func1(0x240f7a0, 0xc4209dbc20, 0xc420987d00, 0xc420117770)
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/manager.go:892 +0xee
github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/state/store.(*MemoryStore).update(0xc4208e6f90, 0x23fcb80, 0xc42039e280, 0xc42021ee08, 0x19b5401, 0xc4209e8cf0)
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/state/store/memory.go:235 +0x134
github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/state/store.(*MemoryStore).Update(0xc4208e6f90, 0xc42021ee08, 0x19, 0x1b00000000)
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/state/store/memory.go:277 +0x47
github.com/docker/docker/vendor/github.com/docker/swarmkit/manager.(*Manager).becomeLeader(0xc420827340, 0x7ff1c20b00c0, 0xc4208e3ec0)
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/manager.go:897 +0x311
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/manager.go:897 +0x311
github.com/docker/docker/vendor/github.com/docker/swarmkit/manager.(*Manager).handleLeadershipEvents(0xc420827340, 0x7ff1c20b00c0, 0xc4208e3ec0, 0xc4208f4600)
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/manager.go:821 +0x1b3
created by github.com/docker/docker/vendor/github.com/docker/swarmkit/manager.(*Manager).Run
        /go/src/github.com/docker/docker/vendor/github.com/docker/swarmkit/manager/manager.go:366 +0x180

I'll investigate.

@aaronlehmann aaronlehmann mentioned this pull request Mar 6, 2017
Merged
@aaronlehmann aaronlehmann force-pushed the vendor-swarmkit-7fc7503 branch from 61826db to fd27f32 Compare March 6, 2017 19:13
@aaronlehmann aaronlehmann changed the title Vendor swarmkit 7fc7503 Vendor swarmkit ac35889 Mar 6, 2017
@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Mar 6, 2017

Updated to swarmkit ac35889. This should fix the problems that showed up in CI.

@aaronlehmann aaronlehmann added rebuild/janky and removed rebuild/experimental status/failing-ci Indicates that the PR in its current state fails the test suite labels Mar 7, 2017
@aaronlehmann aaronlehmann force-pushed the vendor-swarmkit-7fc7503 branch from fd27f32 to 5c0aa1f Compare March 7, 2017 23:23
@aaronlehmann aaronlehmann changed the title Vendor swarmkit ac35889 Vendor swarmkit d60ccf3 Mar 7, 2017
@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Mar 7, 2017

Updated again to d60ccf3. This fixes a data race (moby/swarmkit#2013), hanging service logs (moby/swarmkit#1995), and improper Raft snapshot handling (moby/swarmkit#1989).

PTAL

@dperny
Copy link
Copy Markdown
Contributor

dperny commented Mar 8, 2017

#31500 is blocked until swarmkit is revendored.

Vendor swarmkit d60ccf3
3943331 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@aaronlehmann aaronlehmann force-pushed the vendor-swarmkit-7fc7503 branch from 5c0aa1f to 3943331 Compare March 8, 2017 03:09
@aaronlehmann
Copy link
Copy Markdown
Author

aaronlehmann commented Mar 8, 2017

Added one more test fix: DockerSwarmSuite.TestServiceLogs needs to wait for the swarm manager to become aware that the tasks are running, not just check that the containers have started. This should fix experimental CI.

Merging this will unblock #31500 and #31144.

cpuguy83
cpuguy83 approved these changes Mar 8, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

tonistiigi
tonistiigi approved these changes Mar 8, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

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

LGTM

@tonistiigi tonistiigi merged commit 3fe2730 into moby:master Mar 8, 2017
@GordonTheTurtle GordonTheTurtle added this to the 17.04.0 milestone Mar 8, 2017
@aaronlehmann aaronlehmann deleted the vendor-swarmkit-7fc7503 branch March 8, 2017 18:13
@thaJeztah thaJeztah mentioned this pull request Mar 8, 2017
Merged
@dperny dperny mentioned this pull request Mar 8, 2017
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

17.04.0

Development

Successfully merging this pull request may close these issues.

7 participants

@aaronlehmann @AkihiroSuda @dperny @tonistiigi @cpuguy83 @thaJeztah @GordonTheTurtle
Morty Proxy This is a proxified and sanitized view of the page, visit original site.