Fix issue in docker stats with NetworkDisabled=true
#25905
Merged
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
|
LGTM |
1 similar comment
|
LGTM |
yongtang
force-pushed
the
25000-docker-stats-NetworkDisabled
branch
from
659bca0
to
e3457b4
Compare
|
Thanks @cpuguy83 @tonistiigi for the review. The failing test on Windows is because Windows does not support stats (as is seen on other tests of the same |
mlaventure
added
the
status/failing-ci
|
The win2lin test is a Linux daemon with a windows client, not sure why this new test didn't work though. |
yongtang
force-pushed
the
25000-docker-stats-NetworkDisabled
branch
from
e3457b4
to
3dc9b11
Compare
This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
yongtang
force-pushed
the
25000-docker-stats-NetworkDisabled
branch
from
3dc9b11
to
7bb9c53
Compare
|
Thanks @mlaventure. I removed |
justincormack
removed
the
status/failing-ci
|
LGTM |
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Sep 9, 2016
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.com>
TomasTomecek
added a commit
to TomasTomecek/docker
that referenced
this pull request
Sep 9, 2016
resolves rhbz#1374265 backport of upstream PR: moby#25905
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Sep 9, 2016
resolves rhbz#1374265 backport of upstream PR: moby#25905
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Oct 5, 2016
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.com>
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Oct 12, 2016
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.com>
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Oct 27, 2016
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.com>
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Dec 13, 2016
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.com>
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Dec 16, 2016
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.com>
runcom
pushed a commit
to projectatomic/docker
that referenced
this pull request
Jan 11, 2017
Upstream reference: moby#25905 This fix tries to address the issue in 25000 where `docker stats` will not show network stats with `NetworkDisabled=true`. The `NetworkDisabled=true` could be either invoked through remote API, or through `docker daemon -b none`. The issue was that when `NetworkDisabled=true` either by API or by daemon config, there is no SandboxKey for container so an error will be returned. This fix fixes this issue by skipping obtaining SandboxKey if `NetworkDisabled=true`. Additional test has bee added to cover the changes. This fix fixes 25000. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Antonio Murdaca <runcom@redhat.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.
- What I did
This fix tries to address the issue in #25000 where
docker statswill not show network stats withNetworkDisabled=true.The
NetworkDisabled=truecould be either invoked through remote API, or throughdocker daemon -b none.The issue was that when
NetworkDisabled=trueeither by API or by daemon config, there is no SandboxKey for container so an error will be returned.- How I did it
This fix fixes this issue by skipping obtaining SandboxKey if
NetworkDisabled=true.- How to verify it
Additional test has bee added to cover the changes.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
This fix fixes #25000.
Signed-off-by: Yong Tang yong.tang.github@outlook.com