From 8255318b9604c636b16a95eae3ca62f59294d181 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Mon, 3 Sep 2018 15:16:35 +0800 Subject: [PATCH] Kubelet: do not report used inodes on Windows --- pkg/kubelet/dockershim/docker_image_windows.go | 5 ++--- pkg/kubelet/stats/cri_stats_provider.go | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/dockershim/docker_image_windows.go b/pkg/kubelet/dockershim/docker_image_windows.go index 38fe998be0..8fd6d2c869 100644 --- a/pkg/kubelet/dockershim/docker_image_windows.go +++ b/pkg/kubelet/dockershim/docker_image_windows.go @@ -45,9 +45,8 @@ func (ds *dockerService) ImageFsInfo(_ context.Context, _ *runtimeapi.ImageFsInf filesystems := []*runtimeapi.FilesystemUsage{ { - Timestamp: time.Now().UnixNano(), - UsedBytes: &runtimeapi.UInt64Value{Value: fsinfo.Usage}, - InodesUsed: &runtimeapi.UInt64Value{Value: 0}, + Timestamp: time.Now().UnixNano(), + UsedBytes: &runtimeapi.UInt64Value{Value: fsinfo.Usage}, FsId: &runtimeapi.FilesystemIdentifier{ Mountpoint: info.DockerRootDir, }, diff --git a/pkg/kubelet/stats/cri_stats_provider.go b/pkg/kubelet/stats/cri_stats_provider.go index 1af0a0cbfb..6580f46ead 100644 --- a/pkg/kubelet/stats/cri_stats_provider.go +++ b/pkg/kubelet/stats/cri_stats_provider.go @@ -182,9 +182,11 @@ func (p *criStatsProvider) ImageFsStats() (*statsapi.FsStats, error) { // TODO(yguo0905): Support returning stats of multiple image filesystems. for _, fs := range resp { s := &statsapi.FsStats{ - Time: metav1.NewTime(time.Unix(0, fs.Timestamp)), - UsedBytes: &fs.UsedBytes.Value, - InodesUsed: &fs.InodesUsed.Value, + Time: metav1.NewTime(time.Unix(0, fs.Timestamp)), + UsedBytes: &fs.UsedBytes.Value, + } + if fs.InodesUsed != nil { + s.InodesUsed = &fs.InodesUsed.Value } imageFsInfo := p.getFsInfo(fs.GetFsId()) if imageFsInfo != nil {