storage: guard nil cpu/network/memory stats in the remaining storage drivers - #3930
Open
rootkiller6788 wants to merge 3 commits into
Open
storage: guard nil cpu/network/memory stats in the remaining storage drivers#3930rootkiller6788 wants to merge 3 commits into
rootkiller6788 wants to merge 3 commits into
Conversation
Cpu/Network/Memory became pointers and some containers omit them. AddStats used to panic at stats.Cpu.Usage.Total for such a sample; skip the missing groups like the stdout driver now does.
Same nil-guard as the influxdb/stdout drivers: a container that omits Cpu, Network or Memory used to panic the driver.
A sample missing Cpu, Network or Memory used to panic containerStatsToRows; only set the matching columns when the group is present.
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
1 participant
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.
Follow-up to the stdout nil-check: ContainerStats.Cpu/Network/Memory are pointers now, and a container can legitimately omit one or more of them (e.g. no network namespace). The influxdb, statsd and bigquery drivers dereferenced them unconditionally, so pushing such a sample made the storage driver panic.
Kept it consistent with what the stdout driver already does: skip the cpu/network group when it is nil, and skip the memory group when it is nil. Added a small test per driver that feeds a stats sample with Cpu present but Network/Memory omitted, plus one where all three are omitted.