New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make engine support cluster config event #34032

Merged
merged 2 commits into from Jul 12, 2017

Conversation

Projects
None yet
5 participants
@allencloud
Contributor

allencloud commented Jul 10, 2017

Signed-off-by: allencloud allen.sun@daocloud.io

I found that docker-ce 17.06.0-ce has already supported cluster events, such as node, service, secret and so on. While I think there is still config events missing.

ping @dongluochen @aaronlehmann

- What I did

  1. make engine support cluster config event
  2. add a test case for config event
  3. update swagger.yml to add configs event

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@allencloud

This comment has been minimized.

Show comment
Hide comment
@allencloud

allencloud Jul 10, 2017

Contributor

I think both the CI failure is unrelated, and could anyone help to re-trigger them? @cpuguy83 @vdemeester @thaJeztah

Contributor

allencloud commented Jul 10, 2017

I think both the CI failure is unrelated, and could anyone help to re-trigger them? @cpuguy83 @vdemeester @thaJeztah

@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Jul 10, 2017

Collaborator
Collaborator

vieux commented Jul 10, 2017

@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Jul 10, 2017

Contributor

LGTM

Does this need any doc updates?

Contributor

aaronlehmann commented Jul 10, 2017

LGTM

Does this need any doc updates?

@allencloud

This comment has been minimized.

Show comment
Hide comment
@allencloud

allencloud Jul 10, 2017

Contributor

Since this change will affect the event, I think swagger.yml needs updated. And I hope to add this in PR #34035. Because there are more things missing related to cluster events.
Please remind me if I miss something. @thaJeztah

Contributor

allencloud commented Jul 10, 2017

Since this change will affect the event, I think swagger.yml needs updated. And I hope to add this in PR #34035. Because there are more things missing related to cluster events.
Please remind me if I miss something. @thaJeztah

make engine support cluster config event
Signed-off-by: allencloud <allen.sun@daocloud.io>
@allencloud

This comment has been minimized.

Show comment
Hide comment
@allencloud

allencloud Jul 11, 2017

Contributor

Since #34035 has been merged, I started to add doc update for config events in swagger.yml. PTAL @aaronlehmann @thaJeztah

Contributor

allencloud commented Jul 11, 2017

Since #34035 has been merged, I started to add doc update for config events in swagger.yml. PTAL @aaronlehmann @thaJeztah

@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Jul 11, 2017

Contributor

LGTM

Contributor

aaronlehmann commented Jul 11, 2017

LGTM

@thaJeztah

LGTM

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah
Member

thaJeztah commented Jul 11, 2017

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 11, 2017

Member

hmm, flakiness? https://jenkins.dockerproject.org/job/Docker-PRs-experimental/35595/console

10:27:50 ----------------------------------------------------------------------
10:27:50 FAIL: docker_api_swarm_test.go:281: DockerSwarmSuite.TestAPISwarmLeaderElection
10:27:50 
10:27:50 [d44619f297605] waiting for daemon to start
10:27:50 [d44619f297605] daemon started
10:27:50 
10:27:50 [d2a7f9c3887d5] waiting for daemon to start
10:27:50 [d2a7f9c3887d5] daemon started
10:27:50 
10:27:50 [d7c4c91a9d93d] waiting for daemon to start
10:27:50 [d7c4c91a9d93d] daemon started
10:27:50 
10:27:50 [d44619f297605] exiting daemon
10:27:50 [d44619f297605] waiting for daemon to start
10:27:50 [d44619f297605] daemon started
10:27:50 
10:27:50 docker_api_swarm_test.go:341:
10:27:50     // and that after we added d1 back, the leader hasn't changed
10:27:50     c.Assert(leader.NodeID, checker.Equals, stableleader.NodeID)
10:27:50 ... obtained string = "40kbahq4jhfxfsevo4kfzavjl"
10:27:50 ... expected string = "acz541uxpwsb9820dwu6b8qt5"
10:27:50 
10:27:50 [d44619f297605] exiting daemon
10:27:50 [d2a7f9c3887d5] exiting daemon
10:27:50 [d7c4c91a9d93d] exiting daemon
10:28:25 
Member

thaJeztah commented Jul 11, 2017

hmm, flakiness? https://jenkins.dockerproject.org/job/Docker-PRs-experimental/35595/console

10:27:50 ----------------------------------------------------------------------
10:27:50 FAIL: docker_api_swarm_test.go:281: DockerSwarmSuite.TestAPISwarmLeaderElection
10:27:50 
10:27:50 [d44619f297605] waiting for daemon to start
10:27:50 [d44619f297605] daemon started
10:27:50 
10:27:50 [d2a7f9c3887d5] waiting for daemon to start
10:27:50 [d2a7f9c3887d5] daemon started
10:27:50 
10:27:50 [d7c4c91a9d93d] waiting for daemon to start
10:27:50 [d7c4c91a9d93d] daemon started
10:27:50 
10:27:50 [d44619f297605] exiting daemon
10:27:50 [d44619f297605] waiting for daemon to start
10:27:50 [d44619f297605] daemon started
10:27:50 
10:27:50 docker_api_swarm_test.go:341:
10:27:50     // and that after we added d1 back, the leader hasn't changed
10:27:50     c.Assert(leader.NodeID, checker.Equals, stableleader.NodeID)
10:27:50 ... obtained string = "40kbahq4jhfxfsevo4kfzavjl"
10:27:50 ... expected string = "acz541uxpwsb9820dwu6b8qt5"
10:27:50 
10:27:50 [d44619f297605] exiting daemon
10:27:50 [d2a7f9c3887d5] exiting daemon
10:27:50 [d7c4c91a9d93d] exiting daemon
10:28:25 
add config event in swagger.yml
Signed-off-by: allencloud <allen.sun@daocloud.io>
@allencloud

This comment has been minimized.

Show comment
Hide comment
@allencloud

allencloud Jul 12, 2017

Contributor

Oh, I missed version_history.md. @thaJeztah
In this PR, I will add version change of config events in api version 1.31.
However, I also find that service, node and secret events are also missing in api version 1.30.
And I will do a follow-up #34065 to add these.

Contributor

allencloud commented Jul 12, 2017

Oh, I missed version_history.md. @thaJeztah
In this PR, I will add version change of config events in api version 1.31.
However, I also find that service, node and secret events are also missing in api version 1.30.
And I will do a follow-up #34065 to add these.

@thaJeztah

LGTM, thanks!

@allencloud

This comment has been minimized.

Show comment
Hide comment
@allencloud

allencloud Jul 12, 2017

Contributor

Oh, it is great to see all green, since recently we have experienced lot of test failure. 😄

Contributor

allencloud commented Jul 12, 2017

Oh, it is great to see all green, since recently we have experienced lot of test failure. 😄

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 12, 2017

Member

Oh, it is great to see all green, since recently we have experienced lot of test failure

This PR should resolve some of the test failures / flakyness we saw; #34061

Member

thaJeztah commented Jul 12, 2017

Oh, it is great to see all green, since recently we have experienced lot of test failure

This PR should resolve some of the test failures / flakyness we saw; #34061

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 12, 2017

Member

And, yes, all green 💚 Thanks!

Member

thaJeztah commented Jul 12, 2017

And, yes, all green 💚 Thanks!

@thaJeztah thaJeztah merged commit 334702a into moby:master Jul 12, 2017

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 35622 has succeeded
Details
janky Jenkins build Docker-PRs 44235 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 4608 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 15613 has succeeded
Details
z Jenkins build Docker-PRs-s390x 4308 has succeeded
Details

@allencloud allencloud deleted the allencloud:support-config-event-in-cluster branch Jul 12, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment