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

[17.11] update vndr of swarmkit to bbcec9b9 #295

Merged
andrewhsu merged 2 commits into from
Nov 7, 2017
Merged

[17.11] update vndr of swarmkit to bbcec9b9 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f41a4e7
update vndr of swarmkit to bbcec9b9
andrewhsu Nov 6, 2017
75d1e69
Fix error message for TestSwarmVolumePlugin
nishanttotla Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions components/engine/integration-cli/daemon/daemon_swarm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,23 @@ func (d *Swarm) CheckServiceTasksInState(service string, state swarm.TaskState,
}
}

// CheckServiceTasksInStateWithError returns the number of tasks with a matching state,
// and optional message substring.
func (d *Swarm) CheckServiceTasksInStateWithError(service string, state swarm.TaskState, errorMessage string) func(*check.C) (interface{}, check.CommentInterface) {
return func(c *check.C) (interface{}, check.CommentInterface) {
tasks := d.GetServiceTasks(c, service)
var count int
for _, task := range tasks {
if task.Status.State == state {
if errorMessage == "" || strings.Contains(task.Status.Err, errorMessage) {
Copy link
Copy Markdown
Contributor

@marcusmartins marcusmartins Nov 7, 2017

Choose a reason for hiding this comment

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

@nishanttotla is this a API change that we have to worry about?

Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla Nov 7, 2017

Choose a reason for hiding this comment

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

This is an API change for sure, but I don't think we have to worry too much about it. In case someone outside is consuming this field, their workflow will break but it's not a huge change and not hard to fix.

@andrewhsu let me know if we haven't updated this in the release notes yet, I can help do that.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Nov 7, 2017

Choose a reason for hiding this comment

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

Information is now output in another field, so yes, slight API change in that respect (also why I originally left it out in my summary of changes to cherry-pick), but probably ok if we mention it

count++
}
}
}
return count, nil
}
}

// CheckServiceRunningTasks returns the number of running tasks for the specified service
func (d *Swarm) CheckServiceRunningTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {
return d.CheckServiceTasksInState(service, swarm.TaskStateRunning, "")
Expand Down
2 changes: 1 addition & 1 deletion components/engine/integration-cli/docker_cli_swarm_unix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func (s *DockerSwarmSuite) TestSwarmVolumePlugin(c *check.C) {
c.Assert(err, checker.IsNil, check.Commentf(out))

// Make sure task stays pending before plugin is available
waitAndAssert(c, defaultReconciliationTimeout, d.CheckServiceTasksInState("top", swarm.TaskStatePending, "missing plugin on 1 node"), checker.Equals, 1)
waitAndAssert(c, defaultReconciliationTimeout, d.CheckServiceTasksInStateWithError("top", swarm.TaskStatePending, "missing plugin on 1 node"), checker.Equals, 1)

plugin := newVolumePlugin(c, "customvolumedriver")
defer plugin.Close()
Expand Down
2 changes: 1 addition & 1 deletion components/engine/vendor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
github.com/dmcgowan/go-tar 2e2c51242e8993c50445dab7c03c8e7febddd0cf

# cluster
github.com/docker/swarmkit 872861d2ae46958af7ead1d5fffb092c73afbaf0
github.com/docker/swarmkit bbcec9b9dba9c510fea25be176c5969218dcd1e5
github.com/gogo/protobuf v0.4
github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
Expand Down
2 changes: 2 additions & 0 deletions components/engine/vendor/github.com/docker/swarmkit/agent/exec/controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading