github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cadvisor to v0.33.1.

Browse Source
This commit is contained in:
Lantao Liu
2019-03-07 11:57:27 -08:00
parent f8024ab087
commit 74f4579f07
2 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
vendor/github.com/google/cadvisor/container/raw/handler.go generated vendored
View File

@@ -188,16 +188,15 @@ func fsToFsStats(fs *fs.Fs) info.FsStats {
func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
var filesystems []fs.Fs
if self.includedMetrics.Has(container.DiskUsageMetrics) || self.includedMetrics.Has(container.DiskIOMetrics) {
var err error
// Get Filesystem information only for the root cgroup.
if isRootCgroup(self.name) {
filesystems, err = self.fsInfo.GetGlobalFsInfo()
if err != nil {
return err
}
} else if len(self.externalMounts) > 0 {
var err error
// Get Filesystem information only for the root cgroup.
if isRootCgroup(self.name) {
filesystems, err = self.fsInfo.GetGlobalFsInfo()
if err != nil {
return err
}
} else if self.includedMetrics.Has(container.DiskUsageMetrics) || self.includedMetrics.Has(container.DiskIOMetrics) {
if len(self.externalMounts) > 0 {
var mountSet map[string]struct{}
mountSet = make(map[string]struct{})
for _, mount := range self.externalMounts {
@@ -210,14 +209,14 @@ func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
}
}
if self.includedMetrics.Has(container.DiskUsageMetrics) {
if isRootCgroup(self.name) || self.includedMetrics.Has(container.DiskUsageMetrics) {
for i := range filesystems {
fs := filesystems[i]
stats.Filesystem = append(stats.Filesystem, fsToFsStats(&fs))
}
}
if self.includedMetrics.Has(container.DiskIOMetrics) {
if isRootCgroup(self.name) || self.includedMetrics.Has(container.DiskIOMetrics) {
common.AssignDeviceNamesToDiskStats(&fsNamer{fs: filesystems, factory: self.machineInfoFactory}, &stats.DiskIo)
}