-
Notifications
You must be signed in to change notification settings - Fork 18.6k
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
change memory usage display #12172
change memory usage display #12172
Conversation
Thanks, I'm +1 on this. @crosbymichael WDYT? |
I'm +1 as well |
Moving to code review. |
"testing" | ||
) | ||
|
||
type TestWriter struct { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you could use a bytes.Buffer
instead of a custom type (you can use String()
to query its content after it's been written to).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll change it. Thanks!
0c31097
to
f6f6ddc
Compare
@icecrime @jfrazelle PR was updated, PTAL |
Just so it's not forgotten; the docs may contain examples showing this output, those have to be checked / updated |
@thaJeztah Which doc do you mean? |
@wonderflow this page: http://docs.docker.com/reference/commandline/cli/#stats. The source for that is located here in the repo; docs/sources/reference/commandline/cli.md#stats. Haven't checked if other locations mention it as well (don't remember, but it's possible) |
@thaJeztah Thanks. I'll check all the doc and push another commit. |
LGTM |
LGTM ping @crosbymichael :) |
I find two places of all docs that should be changed. |
Thanks, @wonderflow unfortunately, I see your pull-request now contains a merge-commit (which shouldn't be in there), also, the two commits should be "squashed". To solve this, you'll have to rebase and squash you commits. You can find some instructions for that in Work on an issue - pull and rebase frequently. If you need help with that, feel free to ask for assistance in the #docker-dev IRC channel; there are many experienced developers there that should be able to help you out! |
using standard unix postfixes add unit test for display also change doc for memory usage display change for example GiB will be GB Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
0a187bd
to
d6d8f45
Compare
Thanks! @thaJeztah |
@wonderflow the commit looks ok now, great! (tests are running) |
@thaJeztah |
@wonderflow I know some tests are sometimes randomly failing; don't worry about that! The maintainers can manually trigger the tests to be started again in those cases. I see the tests are all green, so good! |
LGTM |
change memory usage display
Yay, merged! Thanks for your contribution, @wonderflow! |
@thaJeztah Thank you ! |
@@ -24,5 +24,5 @@ Run **docker stats** with multiple containers. | |||
$ docker stats redis1 redis2 | |||
CONTAINER CPU % MEM USAGE/LIMIT MEM % NET I/O | |||
redis1 0.07% 796 KiB/64 MiB 1.21% 788 B/648 B |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like this line was missed
Using standard unix postfixes, for example GiB will be GB .
Add unit test for display.
It's a UI fix, fixes #10824 .
Libcontainer change is here #506
cc @resouer
Signed-off-by: Sun Jianbo wonderflow@zju.edu.cn