Refresh containerd remotes on containerd restarted #36173
Merged
+81
−36
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
ping @thaJeztah |
|
LGTM |
|
|
@thaJeztah Windows doesn't use |
|
Well, something here seems to not like CI.... |
|
The windows CI is definitely unrelated, since this code is not even built on windows. I see that |
|
Janky is also stuck waiting for the daemon to start, multiple times now. |
|
The stack trace would help, I can't see how this is causing it so far :? |
cpuguy83
force-pushed
the
fix_containerd_crash_spin
branch
2 times, most recently
from
d11d95b to
2247756
Compare
Before this patch, when containerd is restarted (due to a crash, or kill, whatever), the daemon would keep trying to process the event stream against the old socket handles. This would lead to a CPU spin due to the error handling when the client can't connect to containerd. This change makes sure the containerd remote client is updated for all registered libcontainerd clients. This is not neccessarily the ideal fix which would likely require a major refactor, but at least gets things to a working state with a minimal patch. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
cpuguy83
force-pushed
the
fix_containerd_crash_spin
branch
from
2247756 to
400126f
Compare
|
Found the issue. It was due to recursive locking in |
|
And green. |
3 tasks
lox
added a commit
to buildkite/elastic-ci-stack-for-aws
that referenced
this pull request
Feb 23, 2018
lox
added a commit
to buildkite/elastic-ci-stack-for-aws
that referenced
this pull request
Feb 23, 2018
Install docker 17.12.1-ce-rc2 to fix moby/moby#36173
lox
added a commit
to buildkite/elastic-ci-stack-for-aws
that referenced
this pull request
Feb 24, 2018
lox
added a commit
to buildkite/elastic-ci-stack-for-aws
that referenced
this pull request
Feb 26, 2018
mikeknox
pushed a commit
to mikeknox/elastic-ci-stack-for-aws
that referenced
this pull request
Apr 10, 2018
… feature/merge-in-v2.3.5 to feature/add_latest_vault_plugin * commit 'bcb6fe5980595d336a08c9b16333c58e733a1758': (52 commits) use stable agent use ami that doesn't require usage agreement Update changelog for 2.3.5-rc2 Bump changelog for v2.3.5 Show docker logs if docker isn't running Fix linting issue in docker installer Install 17.12.1-ce-rc2 to fix moby/moby#36173 Revert "Merge pull request buildkite#360 from buildkite/vpc-rewrite-for-all-available-subnets" Update changelog for v2.3.1-v2.3.4 Add some troubleshooting tips to README Configure docker config in boothook to avoid race conditions Check docker is running in environment Remove du output, will be too slow Try cleaning up disk in the environment hook if needed Trim leading whitespace from disk space output 💅🏻 Make disk space output more human friendly Append to elastic-stack.log rather than overwrite Only redirect cron output if caller is root Tests should run cron as root Add logging to cron tasks and show disk usage in stack environment ...
mikeknox
pushed a commit
to mikeknox/elastic-ci-stack-for-aws
that referenced
this pull request
Apr 10, 2018
… feature/add_latest_vault_plugin to use-vault-plugin * commit 'f50fdfc20190313bd80ddabe1b69fa21d09b3e29': (55 commits) use stable agent use ami that doesn't require usage agreement specify vault-backend branch for vault plugin update to latest vault plugin update to latest vault plugin Update changelog for 2.3.5-rc2 Bump changelog for v2.3.5 Show docker logs if docker isn't running Fix linting issue in docker installer Install 17.12.1-ce-rc2 to fix moby/moby#36173 Revert "Merge pull request buildkite#360 from buildkite/vpc-rewrite-for-all-available-subnets" Update changelog for v2.3.1-v2.3.4 Add some troubleshooting tips to README Configure docker config in boothook to avoid race conditions Check docker is running in environment Remove du output, will be too slow Try cleaning up disk in the environment hook if needed Trim leading whitespace from disk space output 💅🏻 Make disk space output more human friendly Append to elastic-stack.log rather than overwrite ...
mikeknox
pushed a commit
to mikeknox/elastic-ci-stack-for-aws
that referenced
this pull request
Apr 10, 2018
kolyshkin
added a commit
to kolyshkin/moby
that referenced
this pull request
Oct 27, 2020
In case we are killing and restarting containerd, do try to reconnect and use the new connection. Loosely based on moby#36173 Might help https://bugzilla.redhat.com/show_bug.cgi?id=1746435 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this patch, when containerd is restarted (due to a crash, or
kill, whatever), the daemon would keep trying to process the event
stream against the old socket handles. This would lead to a CPU spin due
to the error handling when the client can't connect to containerd.
This change makes sure the containerd remote client is updated for all
registered libcontainerd clients.
This is not necessarily the ideal fix which would likely require a
major refactor, but at least gets things to a working state with a
minimal patch.
Fixes #36002