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

Register healtcheck service before calling restore() #609

Merged

Conversation

mlaventure
Copy link
Contributor

Signed-off-by: Kenfe-Mickael Laventure mickael.laventure@gmail.com

--

This ensures that a client (e.g. dockerd) doesn't assume that containerd is dead if restoring containers takes more than its timeout value (currently 3secs for dockerd)

Should help address moby/moby#31479

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM with minor spelling nit in a comment

if len(listenParts) != 2 {
return fmt.Errorf("bad listen address format %s, expected proto://address", listenSpec)
}
// Register server early to allow healtcheck to be done
Copy link
Member

Choose a reason for hiding this comment

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

minor spelling nit: "healthcheck"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
@crosbymichael
Copy link
Member

LGTM

@tonistiigi any comments?

Copy link
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

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

LGTM

@mlaventure mlaventure merged commit 9f68f96 into containerd:v0.2.x Mar 8, 2017
@mlaventure mlaventure deleted the register-healtcheck-sooner branch March 8, 2017 19:08
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.

None yet

4 participants