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

Trap close error on shutdown #1501

Merged
merged 1 commit into from Sep 13, 2017
Merged

Conversation

crosbymichael
Copy link
Member

Fixes #1499

This traps any Accept() errors on server shutdown so that it exits
cleanly.

It also changes gracefulstop to stop on the grpc server as the daemon
will not shutdown if there are connected clients.

Signed-off-by: Michael Crosby crosbymichael@gmail.com

@codecov-io
Copy link

codecov-io commented Sep 12, 2017

Codecov Report

Merging #1501 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1501   +/-   ##
=======================================
  Coverage   40.82%   40.82%           
=======================================
  Files          23       23           
  Lines        2920     2920           
=======================================
  Hits         1192     1192           
  Misses       1451     1451           
  Partials      277      277

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 558b46f...03b43ac. Read the comment docs.

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

One small nit..given the change from GracefulStop to Stop we might want to change the method comment above it as Stop sounds like it cancels any open gRPC connections (unlike GracefulStop which according to its GoDoc: blocks until all the pending RPCs are finished)

Fixes containerd#1499

This traps any Accept() errors on server shutdown so that it exits
cleanly.

It also changes gracefulstop to stop on the grpc server as the daemon
will not shutdown if there are connected clients.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@crosbymichael
Copy link
Member Author

@estesp updated the comment

@estesp
Copy link
Member

estesp commented Sep 13, 2017

LGTM

Copy link
Contributor

@mlaventure mlaventure 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 0f6d1d2 into containerd:master Sep 13, 2017
mauriciovasquezbernal pushed a commit to kinvolk/containerd that referenced this pull request Nov 13, 2020
…-cgroups-controller

Tolerate missing HugeTLB cgroups controller
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