Skip to content

Conversation

@thaJeztah
Copy link
Member

Backport of #1824 for 17.06

git checkout -b 17.06-backport-rolling_update upstream/bump_17.06
git cherry-pick -s -S -x 4aeb1fc0edaf28dbc610b0bc0c164a498a85a2dd 

no conflicts

This PR contains a fix for moby/moby#30321. There was a moby/moby#31142
PR intending to fix the issue by adding a delay between disabling the
service in the cluster and the shutdown of the tasks. However
disabling the service was not deleting the service info in the cluster.
Added a fix to delete service info from cluster and verified using siege
to ensure there is zero downtime on rolling update of a service.

Signed-off-by: abhi [email protected]
(cherry picked from commit 4aeb1fc)
Signed-off-by: Sebastiaan van Stijn [email protected]

This PR contains a fix for moby/moby#30321. There was a moby/moby#31142
PR intending to fix the issue by adding a delay between disabling the
service in the cluster and the shutdown of the tasks. However
disabling the service was not deleting the service info in the cluster.
Added a fix to delete service info from cluster and verified using siege
to ensure there is zero downtime on rolling update of a service.

Signed-off-by: abhi <[email protected]>
(cherry picked from commit 4aeb1fc)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@fcrisciani
Copy link

I will let @abhi comment, but I think this patch was also having a dependency with the new containerd notification, so not sure if it is safe to simply backport this one

Copy link
Contributor

@abhi abhi left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

Closing; this was cherry-picked through #2157

@thaJeztah thaJeztah closed this Jul 7, 2018
@thaJeztah thaJeztah deleted the 17.06-backport-rolling_update branch July 7, 2018 13:02
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.

3 participants