Skip to content
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

[18.09 backport] Cleanup the cluster provider when the agent is closed #2354

Merged

Conversation

thaJeztah
Copy link
Member

backport of #2307 for the 18.09 branch

@thaJeztah
Copy link
Member Author

ping @mavenugo @euanh PTAL

@selansen
Copy link
Collaborator

selansen commented Apr 1, 2019

@thaJeztah ,
I see test failure on TestNetworkDBIslands. Don't think its related to this one like changer.
do we need re run CI one more time ?

Copy link
Collaborator

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM . We may need to rerun CI one more time , may be ?

Signed-off-by: Kyle Wuolle <kyle.wuolle@gmail.com>
(cherry picked from commit c7125bd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_backport_fix_agent_init_problem branch from 80f6c05 to a4080ed Compare April 12, 2019 15:38
@thaJeztah
Copy link
Member Author

Force-pushed to re-run CI (flaky test)

ping @mavenugo @euanh PTAL 🙏

@kylewuolle
Copy link
Contributor

Force-pushed to re-run CI (flaky test)

ping @mavenugo @euanh PTAL 🙏

Can you try doing the same on this one too!
#2353
Thanks!

@mavenugo mavenugo merged commit 24d94c2 into moby:bump_18.09 Apr 12, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_fix_agent_init_problem branch April 12, 2019 22:41
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Apr 23, 2019
full diff: moby/libnetwork@c902989...872f0a8

- moby/libnetwork#2354 [18.09 backport] Cleanup the cluster provider when the agent is closed
  - backport of moby/libnetwork#2307 Fix for problem where agent is stopped and does not restart
  - fixes docker/for-linux#495 Docker swarm overlay networking not working after --force-new-cluster
- moby/libnetwork#2369 [18.09 BACKPORT] Pick a random host port if the user does not specify a host port
  - backport of moby/libnetwork#2368 (windows) Pick a random host port if the user does not specify a host port

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Apr 23, 2019
full diff: moby/libnetwork@c902989...872f0a8

- moby/libnetwork#2354 [18.09 backport] Cleanup the cluster provider when the agent is closed
  - backport of moby/libnetwork#2307 Fix for problem where agent is stopped and does not restart
  - fixes docker/for-linux#495 Docker swarm overlay networking not working after --force-new-cluster
- moby/libnetwork#2369 [18.09 BACKPORT] Pick a random host port if the user does not specify a host port
  - backport of moby/libnetwork#2368 (windows) Pick a random host port if the user does not specify a host port

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5354408039681020f9ad6afe4bf696fc90f9ce69
Component: engine
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request May 7, 2019
Additional post-18.09.5 fixes:

Builder:
- Fixed COPY and ADD with multiple <src> to not invalidate cache if
  DOCKER_BUILDKIT=1.moby/moby#38964

Networking:
- Cleaned up the cluster provider when the agent is closed. moby/libnetwork#2354
- Windows: Now selects a random host port if the user does not specify a
  host port.  moby/libnetwork#2369
- --service-cluster-ip-range is now configurable for UCP install.
  docker/orca#10263

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request May 7, 2019
Additional post-18.09.5 fixes:

Builder:
- Fixed COPY and ADD with multiple <src> to not invalidate cache if
  DOCKER_BUILDKIT=1.moby/moby#38964

Networking:
- Cleaned up the cluster provider when the agent is closed. moby/libnetwork#2354
- Windows: Now selects a random host port if the user does not specify a
  host port.  moby/libnetwork#2369
- --service-cluster-ip-range is now configurable for UCP install.
  docker/orca#10263

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request May 10, 2019
Additional post-18.09.5 fixes:

Builder:
- Fixed COPY and ADD with multiple <src> to not invalidate cache if
  DOCKER_BUILDKIT=1.moby/moby#38964

Networking:
- Cleaned up the cluster provider when the agent is closed. moby/libnetwork#2354
- Windows: Now selects a random host port if the user does not specify a
  host port.  moby/libnetwork#2369
- --service-cluster-ip-range is now configurable for UCP install.
  docker/orca#10263

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit d692ecb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request May 10, 2019
Additional post-18.09.5 fixes:

Builder:
- Fixed COPY and ADD with multiple <src> to not invalidate cache if
  DOCKER_BUILDKIT=1.moby/moby#38964

Networking:
- Cleaned up the cluster provider when the agent is closed. moby/libnetwork#2354
- Windows: Now selects a random host port if the user does not specify a
  host port.  moby/libnetwork#2369
- --service-cluster-ip-range is now configurable for UCP install.
  docker/orca#10263

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c7e5f9c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
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.

4 participants