storage/stdout: nil-check Cpu, Network, and Memory stats#3917
Merged
Conversation
ContainerStats fields for Cpu, Network, and Memory are pointers and are often unset for some containers. The stdout driver always dereferenced them, which panics as soon as Network is missing (reproduced with -storage_driver=stdout). Skip optional sections when the corresponding pointer is nil. Fixes google#3911 Signed-off-by: Dean Chen <862469039@qq.com>
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Contributor
Author
|
cla: yes |
Contributor
Author
|
I have signed the Google CLA with this GitHub account (locker95) and authorized email 862469039@qq.com. cla: yes Please recheck. |
Signed-off-by: Dean Chen <862469039@qq.com>
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
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.
Problem
With
-storage_driver=stdout, cAdvisor panics:Line 133 is
stats.Network.RxBytes. After the model change,Cpu,Network, andMemoryonContainerStatsare pointers and may be nil for some containers. The stdout driver still treated them as values.Fix
containerStatsToValuesmemoryStatsToValuesTest
Fixes #3911