a few cherry-picks #29150
Merged
a few cherry-picks #29150
Conversation
This file contains 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
In case, a container is restarting indefinitely running "docker stats --no-stream <restarting_container>" is suspended. To fix this, the daemon makes sure the container is either not running or restarting if `--no-stream` is set to true and if so returns an empty stats. Should fix moby#27772. Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com> (cherry picked from commit 786a954) Signed-off-by: Victor Vieux <victorvieux@gmail.com>
|
ping @vdemeester @tonistiigi |
Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 00caf03) Signed-off-by: Victor Vieux <victorvieux@gmail.com>
vieux
changed the title
|
ping @cpuguy83 |
|
LGTM |
Error code resolution is powered by string matching. Not the greatest thing in the world and I hope no one is proud of this code, but it works. However, because a map is used, the iteration order of the map is random, such that if an error matches two of the snippets, it may return a different error code depending on the seed of the hashmap. This change converts it to use a slice instead. Signed-off-by: Stephen J Day <stephen.day@docker.com> (cherry picked from commit 3484e02) Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit ebd804b) Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com> (cherry picked from commit 7b1f77d) Signed-off-by: Victor Vieux <victorvieux@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.
return an empty stats if the container is restarting #28026
re-vendor syslog log driver #28670
api/server/httputils: ensure consistent status code #28530
run dnf upgrade before installing in fedora #29115
hack/make.sh: fix BUILDTIME #29082