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

[19.03 backport] Fix flaky TestServiceWithDefaultAddressPoolInit#376

Merged
andrewhsu merged 3 commits intodocker-archive:19.03from
thaJeztah:19.03_backport_fix_flaky_addr_pool_init_test
Sep 24, 2019
Merged

[19.03 backport] Fix flaky TestServiceWithDefaultAddressPoolInit#376
andrewhsu merged 3 commits intodocker-archive:19.03from
thaJeztah:19.03_backport_fix_flaky_addr_pool_init_test

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 21, 2019

@thaJeztah
Copy link
Member Author

this is now failing because the 19.03 branch is broken, which will be fixed by #374, but that depends on this PR

@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_flaky_addr_pool_init_test branch from bfc8d9e to 4a7caca Compare September 23, 2019 16:23
selansen and others added 3 commits September 23, 2019 18:40
Looks like TestServiceWithDefaultAddressPoolInit is failing
randomly in CI. I am not able to reproduce the issue locally
but this has been reported few times.  So I tried to modify
code and see if I can fix the random failure.

Signed-off-by: selansen <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 88578aa)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1.This commit replaces serviceRunningCount with
swarm.RunningTasksCount to accurately check if the
service is running with the accurate number of instances
or not. serviceRunningCount was only checking the ServiceList
and was not checking if the tasks were running or not

This adds a safe barrier to execute docker network inspect
commands for overlay networks which get created
asynchronously via Swarm

2. Make sure client connections are closed

3. Make sure every service and network name is unique

4. Make sure services and networks are cleaned up

Signed-off-by: Arko Dasgupta <[email protected]>
(cherry picked from commit f3a3ea0)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Arko Dasgupta <[email protected]>
(cherry picked from commit a65dee3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_flaky_addr_pool_init_test branch from 4a7caca to 218af8c Compare September 23, 2019 16:41
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] Fix flaky TestServiceWithDefaultAddressPoolInit [19.03 backport] Fix flaky TestServiceWithDefaultAddressPoolInit Sep 23, 2019
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

failure on ppc64le only because it ran out of time to get a new node

@andrewhsu andrewhsu merged commit 29db7cb into docker-archive:19.03 Sep 24, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_fix_flaky_addr_pool_init_test branch September 24, 2019 19:45
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.

3 participants