github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

fix: add nil check

Browse Source
This commit is contained in:
fengzixu 2022-03-27 08:38:20 +00:00
parent 5cb6fab8f6
commit 38d8aae408
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/kubelet/server/stats/volume_stat_calculator_test.go
View File

@ -206,8 +206,10 @@ func TestAbnormalVolumeEvent(t *testing.T) {
} }
// Calculate stats for pod // Calculate stats for pod
volumeCondition.Message = "The target path of the volume doesn't exist" if volumeCondition != nil {
volumeCondition.Abnormal = true volumeCondition.Message = "The target path of the volume doesn't exist"
volumeCondition.Abnormal = true
}
statsCalculator := newVolumeStatCalculator(mockStats, time.Minute, fakePod, &fakeEventRecorder) statsCalculator := newVolumeStatCalculator(mockStats, time.Minute, fakePod, &fakeEventRecorder)
statsCalculator.calcAndStoreStats() statsCalculator.calcAndStoreStats()
@ -237,16 +239,21 @@ func (v *fakeVolume) GetMetrics() (*volume.Metrics, error) {
} }
func expectedMetrics() *volume.Metrics { func expectedMetrics() *volume.Metrics {
return &volume.Metrics{ vMetrics := &volume.Metrics{
Available: resource.NewQuantity(available, resource.BinarySI), Available: resource.NewQuantity(available, resource.BinarySI),
Capacity: resource.NewQuantity(capacity, resource.BinarySI), Capacity: resource.NewQuantity(capacity, resource.BinarySI),
Used: resource.NewQuantity(available-capacity, resource.BinarySI), Used: resource.NewQuantity(available-capacity, resource.BinarySI),
Inodes: resource.NewQuantity(inodesTotal, resource.BinarySI), Inodes: resource.NewQuantity(inodesTotal, resource.BinarySI),
InodesFree: resource.NewQuantity(inodesFree, resource.BinarySI), InodesFree: resource.NewQuantity(inodesFree, resource.BinarySI),
InodesUsed: resource.NewQuantity(inodesTotal-inodesFree, resource.BinarySI), InodesUsed: resource.NewQuantity(inodesTotal-inodesFree, resource.BinarySI),
Message: &volumeCondition.Message,
Abnormal: &volumeCondition.Abnormal,
} }
if volumeCondition != nil {
vMetrics.Message = &volumeCondition.Message
vMetrics.Abnormal = &volumeCondition.Abnormal
}
return vMetrics
} }
func expectedFSStats() kubestats.FsStats { func expectedFSStats() kubestats.FsStats {
@ -269,9 +276,13 @@ func expectedFSStats() kubestats.FsStats {
func expectedVolumeHealthStats() *kubestats.VolumeHealthStats { func expectedVolumeHealthStats() *kubestats.VolumeHealthStats {
metric := expectedMetrics() metric := expectedMetrics()
return &kubestats.VolumeHealthStats{ hs := &kubestats.VolumeHealthStats{}
Abnormal: *metric.Abnormal,
if metric != nil && metric.Abnormal != nil {
hs.Abnormal = *metric.Abnormal
} }
return hs
} }
// Fake block-volume/metrics provider, block-devices have no inodes // Fake block-volume/metrics provider, block-devices have no inodes
@ -290,12 +301,17 @@ func (v *fakeBlockVolume) GetMetrics() (*volume.Metrics, error) {
} }
func expectedBlockMetrics() *volume.Metrics { func expectedBlockMetrics() *volume.Metrics {
return &volume.Metrics{ vMetrics := &volume.Metrics{
Available: resource.NewQuantity(available, resource.BinarySI), Available: resource.NewQuantity(available, resource.BinarySI),
Capacity: resource.NewQuantity(capacity, resource.BinarySI), Capacity: resource.NewQuantity(capacity, resource.BinarySI),
Used: resource.NewQuantity(available-capacity, resource.BinarySI), Used: resource.NewQuantity(available-capacity, resource.BinarySI),
Abnormal: &volumeCondition.Abnormal,
} }
if volumeCondition != nil {
vMetrics.Abnormal = &volumeCondition.Abnormal
}
return vMetrics
} }
func expectedBlockStats() kubestats.FsStats { func expectedBlockStats() kubestats.FsStats {