From e019acbf69a87c63288a89d1ae21e30d0497342f Mon Sep 17 00:00:00 2001 From: vegbir Date: Tue, 29 Aug 2023 14:47:01 +0800 Subject: [PATCH] cleancode of iocost service 1. fix typos 2. check for non-essential export functions Signed-off-by: vegbir --- pkg/services/iocost/iocost.go | 32 ++++++++++++++-------------- pkg/services/iocost/iocost_origin.go | 12 +++++------ pkg/services/iocost/iocost_test.go | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkg/services/iocost/iocost.go b/pkg/services/iocost/iocost.go index 3513a35..5d0da5d 100644 --- a/pkg/services/iocost/iocost.go +++ b/pkg/services/iocost/iocost.go @@ -161,17 +161,17 @@ func (io *IOCost) PreStart(viewer api.Viewer) error { } // Terminate is the terminating action -func (b *IOCost) Terminate(viewer api.Viewer) error { - if err := b.clearIOCost(); err != nil { +func (io *IOCost) Terminate(viewer api.Viewer) error { + if err := io.clearIOCost(); err != nil { return err } return nil } -func (b *IOCost) dealExistedPods(viewer api.Viewer) error { +func (io *IOCost) dealExistedPods(viewer api.Viewer) error { pods := viewer.ListPodsWithOptions() for _, pod := range pods { - if err := b.configPodIOCostWeight(pod); err != nil { + if err := io.configPodIOCostWeight(pod); err != nil { log.Errorf("config pod iocost failed, err:%v", err) } } @@ -179,35 +179,35 @@ func (b *IOCost) dealExistedPods(viewer api.Viewer) error { } // AddPod to deal the event of adding a pod. -func (b *IOCost) AddPod(podInfo *typedef.PodInfo) error { - return b.configPodIOCostWeight(podInfo) +func (io *IOCost) AddPod(podInfo *typedef.PodInfo) error { + return io.configPodIOCostWeight(podInfo) } // UpdatePod to deal the pod update event. -func (b *IOCost) UpdatePod(old, new *typedef.PodInfo) error { - return b.configPodIOCostWeight(new) +func (io *IOCost) UpdatePod(old, new *typedef.PodInfo) error { + return io.configPodIOCostWeight(new) } // DeletePod to deal the pod deletion event. -func (b *IOCost) DeletePod(podInfo *typedef.PodInfo) error { +func (io *IOCost) DeletePod(podInfo *typedef.PodInfo) error { return nil } -func (b *IOCost) configIOCost(configs []IOCostConfig) error { +func (io *IOCost) configIOCost(configs []IOCostConfig) error { for _, config := range configs { devno, err := getBlkDeviceNo(config.Dev) if err != nil { return err } if config.Model == "linear" { - if err := ConfigIOCostModel(devno, config.Param); err != nil { + if err := configIOCostModel(devno, config.Param); err != nil { return err } } else { return fmt.Errorf("non-linear models are not supported") } - if err := ConfigIOCostQoS(devno, true); err != nil { + if err := configIOCostQoS(devno, true); err != nil { return err } } @@ -215,7 +215,7 @@ func (b *IOCost) configIOCost(configs []IOCostConfig) error { } // clearIOCost used to disable all iocost -func (b *IOCost) clearIOCost() error { +func (io *IOCost) clearIOCost() error { qosbytes, err := cgroup.ReadCgroupFile(blkcgRootDir, iocostQosFile) if err != nil { return err @@ -229,7 +229,7 @@ func (b *IOCost) clearIOCost() error { for _, qosParam := range qosParams { words := strings.FieldsFunc(qosParam, unicode.IsSpace) if len(words) != 0 { - if err := ConfigIOCostQoS(words[0], false); err != nil { + if err := configIOCostQoS(words[0], false); err != nil { return err } } @@ -237,10 +237,10 @@ func (b *IOCost) clearIOCost() error { return nil } -func (b *IOCost) configPodIOCostWeight(podInfo *typedef.PodInfo) error { +func (io *IOCost) configPodIOCostWeight(podInfo *typedef.PodInfo) error { var weight uint64 = offlineWeight if podInfo.Online() { weight = onlineWeight } - return ConfigPodIOCostWeight(podInfo.Path, weight) + return configPodIOCostWeight(podInfo.Path, weight) } diff --git a/pkg/services/iocost/iocost_origin.go b/pkg/services/iocost/iocost_origin.go index c87e948..a5dde74 100644 --- a/pkg/services/iocost/iocost_origin.go +++ b/pkg/services/iocost/iocost_origin.go @@ -32,8 +32,8 @@ const ( wbBlkioinoFile = "memory.wb_blkio_ino" ) -// ConfigIOCostQoS for config iocost qos. -func ConfigIOCostQoS(devno string, enable bool) error { +// configIOCostQoS for config iocost qos. +func configIOCostQoS(devno string, enable bool) error { t := 0 if enable { t = 1 @@ -42,8 +42,8 @@ func ConfigIOCostQoS(devno string, enable bool) error { return cgroup.WriteCgroupFile(qosParam, blkcgRootDir, iocostQosFile) } -// ConfigIOCostModel for config iocost model -func ConfigIOCostModel(devno string, p interface{}) error { +// configIOCostModel for config iocost model +func configIOCostModel(devno string, p interface{}) error { var paramStr string switch param := p.(type) { case LinearParam: @@ -63,9 +63,9 @@ func ConfigIOCostModel(devno string, p interface{}) error { return cgroup.WriteCgroupFile(paramStr, blkcgRootDir, iocostModelFile) } -// ConfigPodIOCostWeight for config iocost weight +// configPodIOCostWeight for config iocost weight // cgroup v1 iocost cannot be inherited. Therefore, only the container level can be configured. -func ConfigPodIOCostWeight(relativePath string, weight uint64) error { +func configPodIOCostWeight(relativePath string, weight uint64) error { if err := cgroup.WriteCgroupFile(strconv.FormatUint(weight, scale), blkcgRootDir, relativePath, iocostWeightFile); err != nil { return err diff --git a/pkg/services/iocost/iocost_test.go b/pkg/services/iocost/iocost_test.go index 3bdadad..393bc38 100644 --- a/pkg/services/iocost/iocost_test.go +++ b/pkg/services/iocost/iocost_test.go @@ -334,7 +334,7 @@ func TestSetPodWeight(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - err := ConfigPodIOCostWeight(tt.cgroupPath, uint64(tt.weight)) + err := configPodIOCostWeight(tt.cgroupPath, uint64(tt.weight)) if tt.wantErr { assert.Contains(t, err.Error(), tt.errMsg) return -- Gitee